[arch-commits] Commit in bash/trunk (PKGBUILD bash-noinfo.patch bash.install)

[Aaron Griffin]

    Date: Thursday, November 6, 2008 @ 11:59:52
  Author: aaron
Revision: 18507

Re-add info file

Added:
  bash/trunk/bash.install
Modified:
  bash/trunk/PKGBUILD
Deleted:
  bash/trunk/bash-noinfo.patch

-------------------+
 PKGBUILD          |    6 +++---
 bash-noinfo.patch |   12 ------------
 bash.install      |   19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-11-06 16:24:44 UTC (rev 18506)
+++ PKGBUILD	2008-11-06 16:59:52 UTC (rev 18507)
@@ -4,7 +4,7 @@
 pkgname=bash
 _patchlevel=039
 pkgver=3.2.$_patchlevel
-pkgrel=3
+pkgrel=4
 pkgdesc="The GNU Bourne Again shell"
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,8 +13,9 @@
 backup=(etc/profile.bash etc/skel/.bashrc etc/skel/.bash_profile)
 depends=('readline>=5.2' 'glibc')
 provides=('sh')
+install=bash.install
 source=(http://ftp.gnu.org/gnu/bash/bash-3.2.tar.gz
-        bash-noinfo.patch profile.bash bashrc)
+        profile.bash bashrc)
 for p in $(seq -w 001 $_patchlevel); do
     source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-$p)
 done
@@ -68,7 +69,6 @@
     msg "applying patch ${p}"
     patch -Np0 -i ${p} || return 1
   done
-  patch -Np1 -i ../bash-noinfo.patch || return 1
 
   ./configure --prefix=/usr --with-curses --enable-readline \
     --without-bash-malloc --with-installed-readline \

Deleted: bash-noinfo.patch
===================================================================
--- bash-noinfo.patch	2008-11-06 16:24:44 UTC (rev 18506)
+++ bash-noinfo.patch	2008-11-06 16:59:52 UTC (rev 18507)
@@ -1,12 +0,0 @@
-diff -Naur bash-3.0-orig/doc/Makefile.in bash-3.0/doc/Makefile.in
---- bash-3.0-orig/doc/Makefile.in	2004-07-27 05:57:48.000000000 -0700
-+++ bash-3.0/doc/Makefile.in	2005-02-11 22:44:49.000000000 -0800
-@@ -220,7 +220,7 @@
- 		$(SHELL) $(SUPPORT_SRCDIR)/mkinstalldirs $(DESTDIR)$(htmldir) ; \
- 	fi
- 	
--install: info installdirs bash.info
-+install: installdirs
- 	-$(INSTALL_DATA) $(srcdir)/bash.1 $(DESTDIR)$(man1dir)/bash${man1ext}
- 	-$(INSTALL_DATA) $(srcdir)/bashbug.1 $(DESTDIR)$(man1dir)/bashbug${man1ext}
- # uncomment the next line to install the builtins man page

Added: bash.install
===================================================================
--- bash.install	                        (rev 0)
+++ bash.install	2008-11-06 16:59:52 UTC (rev 18507)
@@ -0,0 +1,19 @@
+info_dir=/usr/share/info
+info_files=(bash.info)
+
+post_install() {
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+# vim:set ts=2 sw=2 et: