[arch-commits] Commit in glibc/trunk (PKGBUILD glibc.install)
Aaron Griffin
aaron at archlinux.org
Wed Jan 28 20:13:24 UTC 2009
Date: Wednesday, January 28, 2009 @ 15:13:24
Author: aaron
Revision: 25776
upgpkg: glibc 2.9-3
Fix core dep-cycles. Only run install-info if it exists. Remove texinfo dep
Modified:
glibc/trunk/PKGBUILD
glibc/trunk/glibc.install
---------------+
PKGBUILD | 4 ++--
glibc.install | 9 ++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-01-28 20:08:15 UTC (rev 25775)
+++ PKGBUILD 2009-01-28 20:13:24 UTC (rev 25776)
@@ -4,7 +4,7 @@
pkgname=glibc
pkgver=2.9
-pkgrel=2
+pkgrel=3
_glibcdate=20081119
install=glibc.install
backup=(etc/locale.gen)
@@ -13,7 +13,7 @@
license=('GPL' 'LGPL')
url="http://www.gnu.org/software/libc"
groups=('base')
-depends=('sh' 'kernel-headers>=2.6.27.6' 'tzdata' 'texinfo')
+depends=('sh' '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
Modified: glibc.install
===================================================================
--- glibc.install 2009-01-28 20:08:15 UTC (rev 25775)
+++ glibc.install 2009-01-28 20:13:24 UTC (rev 25776)
@@ -34,8 +34,9 @@
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 @@
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
}
More information about the arch-commits
mailing list