[man-db] Updated to 2.6.6

pschiffe pschiffe at fedoraproject.org
Fri Feb 21 11:04:51 UTC 2014


commit 6fbcf16c1f2246791036e16c9455205ed891a04f
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Wed Feb 19 10:53:49 2014 +0100

    Updated to 2.6.6
    
    - resolves: #1057495

 .gitignore                       |    2 +-
 man-db-2.6.2-invalid-cache.patch |  123 --------------------
 man-db-2.6.3-man-options.patch   |  230 --------------------------------------
 man-db-2.6.3-overrides.patch     |   63 -----------
 man-db.spec                      |   23 ++---
 sources                          |    2 +-
 6 files changed, 11 insertions(+), 432 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a09126a..7f68d50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/man-db-2.6.5.tar.xz
+/man-db-2.6.6.tar.xz
diff --git a/man-db.spec b/man-db.spec
index 64473e0..e1724c1 100644
--- a/man-db.spec
+++ b/man-db.spec
@@ -1,10 +1,10 @@
 %global cache /var/cache/man
-%global gnulib_ver 20130623
+%global gnulib_ver 20130805
 
 Summary: Tools for searching and reading man pages
 Name: man-db
-Version: 2.6.5
-Release: 3%{?dist}
+Version: 2.6.6
+Release: 1%{?dist}
 # GPLv2+ .. man-db
 # GPLv3+ .. gnulib
 License: GPLv2+ and GPLv3+
@@ -15,13 +15,6 @@ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.ta
 Source1: man-db.crondaily
 Source2: man-db.sysconfig
 
-# resolves: #841431
-Patch4: man-db-2.6.2-invalid-cache.patch
-# adds support for man-pages-overrides
-Patch5: man-db-2.6.3-overrides.patch
-# fixed certain man pages to match options with --help and --usage
-Patch8: man-db-2.6.3-man-options.patch
-
 Obsoletes: man < 2.0
 Provides: man = %{version}
 Provides: man-pages-reader = %{version}
@@ -42,14 +35,12 @@ manual pages.
 
 %prep
 %setup -q
-%patch4 -p1 -b .invalid-cache
-%patch5 -p1 -b .overrides
-%patch8 -p1 -b .man-options
 
 %build
 %configure \
     --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \
-    --disable-setuid --with-browser=elinks --with-lzip=lzip
+    --disable-setuid --with-browser=elinks --with-lzip=lzip \
+    --with-override-dir=overrides
 make CC="%{__cc} %{optflags}" %{?_smp_mflags} V=1
 
 %check
@@ -127,6 +118,10 @@ install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/man-db
 %lang(zh_CN)   %{_datadir}/man/zh_CN/man*/*
 
 %changelog
+* Wed Feb 19 2014 Peter Schiffer <pschiffe at redhat.com> - 2.6.6-1
+- resolves: #1057495
+  updated to 2.6.6
+
 * Wed Aug 07 2013 Pierre-Yves Chibon <pingou at pingoured.fr> - 2.6.5-3
 - Add a missing requirement on crontabs to spec file
 - Mark the cron job as config(noreplace)
diff --git a/sources b/sources
index 101a8bd..bf31e73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36f59d9314b45a266ba350584b4d7cc1  man-db-2.6.5.tar.xz
+5d65d66191080c144437a6c854e17868  man-db-2.6.6.tar.xz


More information about the scm-commits mailing list