diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-03-13 21:52:26 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-03-13 21:52:26 (GMT) |
| commit | 2b54be0f61030353be24be66a31fe5f04318acbd (patch) | |
| tree | 54f7440630abde5abf7576edc66624bca6f7e8fe /abs | |
| parent | d0e2c4462627d0f1e289aea8ae5c352293194b79 (diff) | |
| download | linhes_pkgbuild-2b54be0f61030353be24be66a31fe5f04318acbd.zip linhes_pkgbuild-2b54be0f61030353be24be66a31fe5f04318acbd.tar.gz linhes_pkgbuild-2b54be0f61030353be24be66a31fe5f04318acbd.tar.bz2 | |
upstream sync for glibc.
Diffstat (limited to 'abs')
| -rw-r--r-- | abs/core-testing/glibc/ChangeLog | 4 | ||||
| -rw-r--r-- | abs/core-testing/glibc/PKGBUILD | 6 | ||||
| -rw-r--r-- | abs/core-testing/glibc/glibc.install | 9 |
3 files changed, 13 insertions, 6 deletions
diff --git a/abs/core-testing/glibc/ChangeLog b/abs/core-testing/glibc/ChangeLog index dfd8a41..631f360 100644 --- a/abs/core-testing/glibc/ChangeLog +++ b/abs/core-testing/glibc/ChangeLog @@ -1,3 +1,7 @@ +glibc 2.9-3 +- remove texinfo dep +- only call install-info when needed + glibc 2.9-2 - apply Fedora10 changes to fix name resolving issues diff --git a/abs/core-testing/glibc/PKGBUILD b/abs/core-testing/glibc/PKGBUILD index 01bf433..e7f866f 100644 --- a/abs/core-testing/glibc/PKGBUILD +++ b/abs/core-testing/glibc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 21686 2008-12-14 19:22:51Z andyrtr $ +# $Id: PKGBUILD 25809 2009-01-29 17:49:56Z aaron $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=glibc pkgver=2.9 -pkgrel=2 +pkgrel=4 _glibcdate=20081119 install=glibc.install backup=(etc/locale.gen) @@ -13,7 +13,7 @@ arch=(i686 x86_64) license=('GPL' 'LGPL') url="http://www.gnu.org/software/libc" groups=('base') -depends=('sh' 'kernel-headers>=2.6.27.6' 'tzdata' 'texinfo') +depends=('kernel-headers>=2.6.27.6' 'tzdata') makedepends=('gcc>=4.3.2-2') replaces=('glibc-xen') source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.bz2 diff --git a/abs/core-testing/glibc/glibc.install b/abs/core-testing/glibc/glibc.install index 2ed1127..17c6b5d 100644 --- a/abs/core-testing/glibc/glibc.install +++ b/abs/core-testing/glibc/glibc.install @@ -34,8 +34,9 @@ mv /lib64 /lib && echo "/lib64 moved" fi fi + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null done } @@ -121,13 +122,15 @@ if [ "`uname -m`" = "x86_64" ]; then fi fi + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null done } pre_remove() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null + usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null done } |