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

[Allan McRae]

    Date: Monday, February 14, 2011 @ 19:42:38
  Author: allan
Revision: 110038

upgpkg: bash 4.2-1
upstream update

Modified:
  bash/trunk/PKGBUILD
  bash/trunk/bash.install

--------------+
 PKGBUILD     |   30 +++++++++++-------------------
 bash.install |    3 +--
 2 files changed, 12 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-15 00:42:23 UTC (rev 110037)
+++ PKGBUILD	2011-02-15 00:42:38 UTC (rev 110038)
@@ -3,9 +3,10 @@
 # Maintainer: Allan McRae <allan at archlinux.org>
 
 pkgname=bash
-_patchlevel=009 #prepare for some patches
-pkgver=4.1.$_patchlevel
-pkgrel=4
+_basever=4.2
+_patchlevel=000 #prepare for some patches
+pkgver=$_basever  #.$_patchlevel
+pkgrel=1
 pkgdesc="The GNU Bourne Again shell"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +16,7 @@
 depends=('readline>=6.1' 'glibc')
 provides=('sh')
 install=bash.install
-source=(http://ftp.gnu.org/gnu/bash/bash-4.1.tar.gz
+source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz
         dot.bashrc
         dot.bash_profile
         dot.bash_logout
@@ -23,13 +24,13 @@
         system.bash_logout)
 if [ $_patchlevel -gt 000 ]; then
     for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-        source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-$(printf "%03d" $p))
+        source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash41-$(printf "%03d" $p))
     done
 fi
 
 build() {
-  cd ${srcdir}/${pkgname}-4.1
-  for p in ../bash41-*; do
+  cd ${srcdir}/${pkgname}-$_basever
+  for p in ../bash${_basever//./}-*; do
     [ -e "$p" ] || continue
     msg "applying patch ${p}"
     patch -Np0 -i ${p}
@@ -49,7 +50,7 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-4.1
+  cd ${srcdir}/${pkgname}-$_basever
   make DESTDIR=${pkgdir} install
 
   # for now, bash is our default /bin/sh
@@ -68,18 +69,9 @@
   install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout
 }
 
-md5sums=('9800d8724815fd84994d9be65ab5e7b8'
+md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
          '027d6bd8f5f6a06b75bb7698cb478089'
          '2902e0fee7a9168f3a4fd2ccd60ff047'
          '42f4400ed2314bd7519c020d0187edc5'
          'fe5d3a367f7d5f754214dc05e3d958ab'
-         '472f536d7c9e8250dc4568ec4cfaf294'
-         '582dea5671b557f783e18629c2f77b68'
-         '118d465095d4a4706eb1d34696a2666a'
-         '120f7cf039a40d35fe375e59d6f17adc'
-         '336ee037fc2cc1e2350b05097fbdc87c'
-         '9471e666797f0b03eb2175ed752a9550'
-         'fb80ccd58cb1e34940f3adf4ce6e4a1e'
-         '192a8b161d419a1d0d211169f1d1046e'
-         '1dc5a0253827decbe6aa529cde83e154'
-         'ea361b842b7405a7f5ebbabbdf74372f')
+         '472f536d7c9e8250dc4568ec4cfaf294')

Modified: bash.install
===================================================================
--- bash.install	2011-02-15 00:42:23 UTC (rev 110037)
+++ bash.install	2011-02-15 00:42:38 UTC (rev 110038)
@@ -1,4 +1,4 @@
-info_dir=/usr/share/info
+info_dir=usr/share/info
 info_files=(bash.info)
 
 post_install() {
@@ -18,4 +18,3 @@
     usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done
 }
-# vim:set ts=2 sw=2 et: