- updated to 2.10.0

diff --git a/man-db.spec b/man-db.spec
index fb6cae9ba4fca7d5a8e968ee9d15f239bccd8721..276bd7e61cde109cd82204ee141853e1b4b31745 100644 (file)
--- a/man-db.spec
+++ b/man-db.spec
@@ -6,14 +6,14 @@
 Summary:       Tools for searching and reading man pages
 Summary(pl.UTF-8):     Narzędzia do przeszukiwania i czytania stron podręcznika man
 Name:          man-db
-Version:       2.9.3
+Version:       2.10.0
 Release:       1
 # project man-db  GPLv2+
 # Gnulib part     GPLv3+
 License:       GPL v2+ and GPL v3+
 Group:         Base
 Source0:       http://download.savannah.gnu.org/releases/man-db/%{name}-%{version}.tar.xz
-# Source0-md5: 4c8721faa54a4c950c640e5e5c713fb0
+# Source0-md5: 96009cd422f2e62b01b8c4de0f5691f1
 Source1:       %{name}.daily
 Source2:       %{name}.sysconfig
 # Resolves: #655385 - use old format of nroff output
@@ -42,8 +42,8 @@ Requires:     libpipeline >= 1.5.0
 Suggests:      zstd
 Provides:      man-pages-reader = %{version}
 Obsoletes:     man < 1.7
-Obsoletes:     man-config
-Obsoletes:     man-whatis
+Obsoletes:     man-config < 1.7
+Obsoletes:     man-whatis < 1.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                pkgcachedir     /var/cache/man
@@ -122,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README man-db-manual.txt man-db-manual.ps docs/COPYING ChangeLog NEWS
+%doc ChangeLog FAQ NEWS.md README.md man-db-manual.txt man-db-manual.ps
 %config(noreplace) %{_sysconfdir}/man_db.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/man-db
 %attr(750,root,root) /etc/cron.daily/man-db.cron
@@ -172,6 +172,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(pl) %{_mandir}/pl/man*/*
 %lang(pt) %{_mandir}/pt/man*/*
 %lang(pt_BR) %{_mandir}/pt_BR/man*/*
+%lang(ro) %{_mandir}/ro/man*/*
 %lang(ru) %{_mandir}/ru/man*/*
 %lang(sr) %{_mandir}/sr/man*/*
 %lang(sv) %{_mandir}/sv/man*/*

diff --git a/sgr.patch b/sgr.patch
index a41cd2104fda957558f4053497db446541ffce59..066cd05606fb6b753303f4c686c2643e868c732e 100644 (file)
--- a/sgr.patch
+++ b/sgr.patch
@@ -1,15 +1,3 @@
-diff -up man-db-2.5.9/include/manconfig.h.in.sgr man-db-2.5.9/include/manconfig.h.in
---- man-db-2.5.9/include/manconfig.h.in.sgr    2010-11-17 12:30:36.000000000 +0100
-+++ man-db-2.5.9/include/manconfig.h.in        2010-11-24 11:29:57.000000000 +0100
-@@ -128,7 +128,7 @@
- 
- #ifndef NROFF_MISSING
- #  ifndef NROFF
--#    define NROFF     "@nroff@"
-+#    define NROFF     "@nroff@ -c"
- #  endif
- #endif
- 
 diff -up man-db-2.5.9/src/man_db.conf.in.sgr man-db-2.5.9/src/man_db.conf.in
 --- man-db-2.5.9/src/man_db.conf.in.sgr        2009-03-15 13:17:24.000000000 +0100
 +++ man-db-2.5.9/src/man_db.conf.in    2010-11-24 11:27:45.000000000 +0100