Merge remote-tracking branch 'stevee/grub2-fix'

[ipfire-3.x.git] / man-db / man-db.nm

diff --git a/man-db/man-db.nm b/man-db/man-db.nm
index 224fe0a23b0a281edde3c01564bafa9632688311..a36ea9863e7ecd93ff981056a0055c886ae3d625 100644 (file)
--- a/man-db/man-db.nm
+++ b/man-db/man-db.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = man-db
-version    = 2.6.1
-release    = 2
+version    = 2.7.1
+release    = 1
 
 groups     = Documentation
 url        = http://savannah.nongnu.org/projects/man-db
@@ -20,6 +20,7 @@ description
 end
 
 source_dl  = http://download.savannah.gnu.org/releases/man-db/
+sources    = %{thisapp}.tar.xz
 
 build
        requires
@@ -27,27 +28,27 @@ build
                gdbm-devel
                groff
                less
-               libpipeline-devel
+               libpipeline-devel >= 1.4.0
+               systemd-devel
+               zlib-devel
        end
 
        configure_options += \
+               --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=%{bindir}/lynx \
-               --with-col=%{bindir}/col \
-               --with-vgrind=%{bindir}/vgrind \
-               --with-grap=%{bindir}/grap \
-               --disable-rpath
-
-       prepare_cmds
-               sed -i -e '\%\t/usr/man%d' -e '\%\t/usr/local/man%d' \
-                       src/man_db.conf.in
-       end
+               --with-browser=elinks
 
        install_cmds
-               # Move some libs
-               mv -v %{BUILDROOT}%{libdir}/man-db/* %{BUILDROOT}%{libdir}/
-               rm -rf %{BUILDROOTi}%{libdir}/man-db/
+               # Move the libs to /usr/lib, but don't keep the symlinks so nothing
+               # will link against libman and libmandb as they are not stable.
+               mv -v %{BUILDROOT}%{libdir}/man-db/libman{,db}-%{version}.so %{BUILDROOT}%{libdir}
+               rm -rf %{BUILDROOT}%{libdir}/man-db/
+
+               # Remove zsoelim man page which is not part of groff
+               rm -vf %{BUILDROOT}%{datadir}/man/man*/zsoelim.*
 
+               # Create cache directory.
+               mkdir -pv %{BUILDROOT}/var/cache/man
        end
 end
 
@@ -65,6 +66,27 @@ packages
                provides
                        man
                end
+
+               script posttransin
+                       # Update the database right now.
+                       rm -rf /var/cache/man/*
+
+                       systemctl -q enable man-db.timer
+                       systemctl start man-db.timer
+               end
+
+               script posttransup
+                       # Update the database right now.
+                       rm -rf /var/cache/man/*
+
+                       systemctl -q enable man-db.timer
+                       systemctl start man-db.timer
+               end
+
+               script preun
+                       systemctl stop man-db.timer
+                       systemctl -q disable man-db.timer
+               end
        end
 
        package %{name}-debuginfo