[arch-commits] Commit in man-db/trunk (6 files)

[Jan Steffens]

    Date: Saturday, May 14, 2016 @ 12:30:18
  Author: heftig
Revision: 267945

2.7.5-2: Update manpage index using hooks

Separated into Install/Upgrade and Remove because scanning for removed manpages takes a second.

Added:
  man-db/trunk/man-db-purge.hook
  man-db/trunk/man-db.hook
Modified:
  man-db/trunk/PKGBUILD
  man-db/trunk/man-db.install
Deleted:
  man-db/trunk/man-db.service
  man-db/trunk/man-db.timer

-------------------+
 PKGBUILD          |   17 ++++++++---------
 man-db-purge.hook |    9 +++++++++
 man-db.hook       |   10 ++++++++++
 man-db.install    |    6 ------
 man-db.service    |   11 -----------
 man-db.timer      |    7 -------
 6 files changed, 27 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-14 09:13:42 UTC (rev 267944)
+++ PKGBUILD	2016-05-14 10:30:18 UTC (rev 267945)
@@ -4,7 +4,7 @@
 
 pkgname=man-db
 pkgver=2.7.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A utility for reading man pages"
 arch=('i686' 'x86_64')
 url="http://www.nongnu.org/man-db/"
@@ -19,12 +19,13 @@
 install=${pkgname}.install
 source=(http://download-mirror.savannah.gnu.org/releases/man-db/$pkgname-$pkgver.tar.xz{,.sig}
         convert-mans
-        man-db.{timer,service})
+        man-db.hook
+        man-db-purge.hook)
 md5sums=('37da0bb0400cc7b640f33c26f6052202'
          'SKIP'
          '2b7662a7d5b33fe91f9f3e034361a2f6'
-         'df6d4f432e3e16c255c785fca1447346'
-         '36fb3f616e42a0e23cf7a4d284e640cd')
+         '2fe885f9f5d2914b6c7f41b8fd9c4f2b'
+         '0a8b9e0f85692ca9133d707069ab9714')
 validpgpkeys=('AC0A4FF12611B6FCCF01C111393587D97D86500B') # Colin Watson <cjwatson at debian.org>
 
 build() {
@@ -60,9 +61,7 @@
   # http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html
   install -D -m755 ${srcdir}/convert-mans  ${pkgdir}/usr/bin/convert-mans 
 
-  # install man-db update timer
-  install -D -m644 ${srcdir}/man-db.timer ${pkgdir}/usr/lib/systemd/system/man-db.timer
-  install -D -m644 ${srcdir}/man-db.service ${pkgdir}/usr/lib/systemd/system/man-db.service
-  install -d -m755 ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants
-  ln -s ../man-db.timer ${pkgdir}//usr/lib/systemd/system/multi-user.target.wants/man-db.timer
+  # install man-db update hooks
+  install -d ${pkgdir}/usr/share/libalpm/hooks
+  install -m644 ${srcdir}/*.hook ${pkgdir}/usr/share/libalpm/hooks/
 }

Added: man-db-purge.hook
===================================================================
--- man-db-purge.hook	                        (rev 0)
+++ man-db-purge.hook	2016-05-14 10:30:18 UTC (rev 267945)
@@ -0,0 +1,9 @@
+[Trigger]
+Type = File
+Operation = Remove
+Target = usr/share/man/*
+
+[Action]
+Description = Purging old manpage index entries...
+When = PostTransaction
+Exec = /bin/sh -c 'mkdir -p /var/cache/man; exec mandb --quiet'

Added: man-db.hook
===================================================================
--- man-db.hook	                        (rev 0)
+++ man-db.hook	2016-05-14 10:30:18 UTC (rev 267945)
@@ -0,0 +1,10 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/share/man/*
+
+[Action]
+Description = Updating manpage index...
+When = PostTransaction
+Exec = /bin/sh -c 'mkdir -p /var/cache/man; exec mandb --quiet --no-purge'

Modified: man-db.install
===================================================================
--- man-db.install	2016-05-14 09:13:42 UTC (rev 267944)
+++ man-db.install	2016-05-14 10:30:18 UTC (rev 267945)
@@ -1,9 +1,3 @@
-post_install() {
-  echo "it's recommended to create an initial"
-  echo "database running as root:"
-  echo "\"/usr/bin/mandb --quiet\""
-}
-
 post_upgrade() {
   # force database rebuild as recommended per upstream
   if [ "`vercmp $2 2.7.0`" -lt 0 ]; then

Deleted: man-db.service
===================================================================
--- man-db.service	2016-05-14 09:13:42 UTC (rev 267944)
+++ man-db.service	2016-05-14 10:30:18 UTC (rev 267945)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Update man-db cache
-RequiresMountsFor=/var/cache/man
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/mkdir -m 0755 -p /var/cache/man
-ExecStart=/usr/bin/mandb --quiet
-Nice=19
-IOSchedulingClass=best-effort
-IOSchedulingPriority=7

Deleted: man-db.timer
===================================================================
--- man-db.timer	2016-05-14 09:13:42 UTC (rev 267944)
+++ man-db.timer	2016-05-14 10:30:18 UTC (rev 267945)
@@ -1,7 +0,0 @@
-[Unit]
-Description=Daily man-db cache update
-
-[Timer]
-OnCalendar=daily
-AccuracySec=12h
-Persistent=true