[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9eca7db9e15a738a310feabb55f72bc26adc0fe4

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3903 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  9eca7db9e15a738a310feabb55f72bc26adc0fe4 (commit)
      from  309682b01fe96f564ba3270f07bd688a9a91ebcc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9eca7db9e15a738a310feabb55f72bc26adc0fe4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jun 7 22:21:38 2012 +0200

    man-db: Make package more handy.
    
    This patch adds a cron job which will index the man pages daily
    and executed after the package has been installed.
    
    Also is elinks the new browser (and currently the single on
    IPFire is shipping).

-----------------------------------------------------------------------

Summary of changes:
 man-db/man-db.cron |   20 ++++++++++++++++++++
 man-db/man-db.nm   |   37 +++++++++++++++++++++++--------------
 2 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 man-db/man-db.cron

Difference in files:
diff --git a/man-db/man-db.cron b/man-db/man-db.cron
new file mode 100644
index 0000000..c7d21ad
--- /dev/null
+++ b/man-db/man-db.cron
@@ -0,0 +1,20 @@
+#! /bin/bash
+
+renice +19 -p $$ >/dev/null 2>&1
+ionice -c3 -p $$ >/dev/null 2>&1
+
+LOCKFILE=/var/lock/man-db.lock
+
+# The lockfile is not meant to be perfect, it's just in case the
+# two man-db cron scripts get run close to each other to keep
+# them from stepping on each other's toes.  The worst that will
+# happen is that they will temporarily corrupt the database.
+[ -f $LOCKFILE ] && exit 0
+
+trap "{ rm -f $LOCKFILE ; exit 0; }" EXIT
+touch $LOCKFILE
+
+# Create/update the mandb database.
+mandb -q
+
+exit 0
diff --git a/man-db/man-db.nm b/man-db/man-db.nm
index 224fe0a..b392038 100644
--- a/man-db/man-db.nm
+++ b/man-db/man-db.nm
@@ -5,7 +5,7 @@
 
 name       = man-db
 version    = 2.6.1
-release    = 2
+release    = 3
 
 groups     = Documentation
 url        = http://savannah.nongnu.org/projects/man-db
@@ -31,23 +31,22 @@ build
 	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/
 
+		# Create cron job to regularly update the man page database.
+		mkdir -pv %{BUILDROOT}%{sysconfdir}/cron.daily
+		install -v -m 755 %{DIR_SOURCE}/man-db.cron %{BUILDROOT}%{sysconfdir}/cron.daily
+
+		# Create cache directory.
+		mkdir -pv %{BUILDROOT}/var/cache/man
 	end
 end
 
@@ -65,6 +64,16 @@ packages
 		provides
 			man
 		end
+
+		script posttransin
+			# Update the database right now.
+			%{sysconfdir}/cron.daily/man-db.cron
+		end
+
+		script posttransup
+			# Update the database right now.
+			%{sysconfdir}/cron.daily/man-db.cron
+		end
 	end
 
 	package %{name}-debuginfo


hooks/post-receive
--
IPFire 3.x development tree