[arch-commits] Commit in texinfo/trunk (4 files)

[Allan McRae]

    Date: Wednesday, April 27, 2016 @ 12:40:43
  Author: allan
Revision: 266201

upgpkg: texinfo 6.1-2

add hooks for handling info page directory updates

Added:
  texinfo/trunk/texinfo-install.hook
  texinfo/trunk/texinfo-remove.hook
Modified:
  texinfo/trunk/PKGBUILD
Deleted:
  texinfo/trunk/texinfo.install

----------------------+
 PKGBUILD             |   16 +++++++++++-----
 texinfo-install.hook |   11 +++++++++++
 texinfo-remove.hook  |   10 ++++++++++
 texinfo.install      |   21 ---------------------
 4 files changed, 32 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-27 10:20:50 UTC (rev 266200)
+++ PKGBUILD	2016-04-27 10:40:43 UTC (rev 266201)
@@ -5,19 +5,22 @@
 
 pkgname=texinfo
 pkgver=6.1
-pkgrel=1
+pkgrel=2
 pkgdesc='GNU documentation system for on-line information and printed output'
 arch=('i686' 'x86_64')
 url='http://www.gnu.org/software/texinfo/'
 license=('GPL3')
 groups=('base' 'base-devel')
-depends=('ncurses' 'findutils' 'gzip' 'perl' 'sh')
-install=texinfo.install
+depends=('ncurses' 'gzip' 'perl' 'sh')
 source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
-        texinfo-6.0-disable-failing-info-test.patch)
+        texinfo-6.0-disable-failing-info-test.patch
+        texinfo-install.hook
+        texinfo-remove.hook)
 md5sums=('1d7ec1888fae00730693597852b00cde'
          'SKIP'
-         '8bfaa21315a8a6184811de8478005d22')
+         '8bfaa21315a8a6184811de8478005d22'
+         '9a98fb162650ff3065f9a4ebec22db36'
+         '988aee415c7302238e0cf1f3c8c42e2c')
 validpgpkeys=('EAF669B31E31E1DECBD11513DDBC579DAB37FBA9') # Gavin Smith
 
 prepare() {
@@ -37,4 +40,7 @@
 
 package() {
   make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
+
+  install -dm755 "$pkgdir"/usr/share/libalpm/hooks/
+  install -m644 texinfo-{install,remove}.hook "$pkgdir"/usr/share/libalpm/hooks/
 }

Added: texinfo-install.hook
===================================================================
--- texinfo-install.hook	                        (rev 0)
+++ texinfo-install.hook	2016-04-27 10:40:43 UTC (rev 266201)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/share/info/*
+
+[Action]
+Description = Updating the info directory file...
+When = PostTransaction
+Exec = /bin/sh -c 'while read -r f; do install-info "$f" /usr/share/info/dir 2> /dev/null; done'
+NeedsTargets

Added: texinfo-remove.hook
===================================================================
--- texinfo-remove.hook	                        (rev 0)
+++ texinfo-remove.hook	2016-04-27 10:40:43 UTC (rev 266201)
@@ -0,0 +1,10 @@
+[Trigger]
+Type = File
+Operation = Remove
+Target = usr/share/info/*
+
+[Action]
+Description = Removing old entries from the info directory file...
+When = PostTransaction
+Exec = /bin/sh -c 'while read -r f; do install-info --delete "$f" /usr/share/info/dir 2> /dev/null; done'
+NeedsTargets

Deleted: texinfo.install
===================================================================
--- texinfo.install	2016-04-27 10:20:50 UTC (rev 266200)
+++ texinfo.install	2016-04-27 10:40:43 UTC (rev 266201)
@@ -1,21 +0,0 @@
-infodir=usr/share/info
-filelist=(info.info info-stnd.info texinfo.info{,-1,-2,-3})
-
-post_install() {
-  # Scan *all* info files on install
-  for file in $(find $infodir -type f ! -name dir); do
-      install-info $file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}