Date: Saturday, November 20, 2010 @ 05:13:40 Author: allan Revision: 100093
upgpkg: readline 6.1.002-2 do not source ~/.inputrc in /etc/inputrc (FS#21729), tidy PKGBUILD Modified: readline/trunk/PKGBUILD readline/trunk/inputrc ----------+ PKGBUILD | 30 +++++++++++++++++------------- inputrc | 4 ---- 2 files changed, 17 insertions(+), 17 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-11-20 09:55:40 UTC (rev 100092) +++ PKGBUILD 2010-11-20 10:13:40 UTC (rev 100093) @@ -1,26 +1,26 @@ # $Id$ -# Maintainer: Andreas Radke <[email protected]> +# Maintainer: Allan McRae <[email protected]> # Contributor: judd <[email protected]> pkgname=readline _patchlevel=002 #prepare for some patches pkgver=6.1.$_patchlevel -pkgrel=1 +pkgrel=2 pkgdesc="GNU readline library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://tiswww.case.edu/php/chet/readline/rltop.html"; license=('GPL') depends=('glibc' 'ncurses') -backup=("etc/inputrc") +backup=('etc/inputrc') source=(http://ftp.gnu.org/gnu/readline/readline-6.1.tar.gz inputrc) if [ $_patchlevel -gt 00 ]; then - for (( p=1; p<=$_patchlevel; p++ )); do + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do source=(${sour...@]} http://ftp.gnu.org/gnu/readline/readline-6.1-patches/readline61-$(printf "%03d" $p)) done fi md5sums=('fc2f7e714fe792db1ce6ddc4c9fb4ef3' - 'e5fc955f56d9fa5beb871f3279b8fa8b' + '58d54966c1191db45973cb3191ac621a' 'c642f2e84d820884b0bf9fd176bc6c3f' '1a76781a1ea734e831588285db7ec9b1') @@ -29,7 +29,7 @@ for p in ../readline61-*; do [ -e "$p" ] || continue msg "applying patch ${p}" - patch -Np0 -i ${p} || return 1 + patch -Np0 -i ${p} done # Remove RPATH from shared objects (FS#14366) @@ -40,13 +40,17 @@ ./configure --prefix=/usr --libdir=/lib \ --mandir=/usr/share/man --infodir=/usr/share/info - make SHLIB_LIBS=-lncurses || return 1 - make DESTDIR=${pkgdir} install || return 1 + make SHLIB_LIBS=-lncurses +} + +package() { + cd ${srcdir}/${pkgname}-6.1 + make DESTDIR=${pkgdir} install - mkdir -p ${pkgdir}/etc - install -m644 ../inputrc ${pkgdir}/etc/inputrc || return 1 - #FHS recommends only shared libs in /lib - mkdir -p $pkgdir/usr/lib + install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc + + # FHS recommends only shared libs in /lib + install -dm755 $pkgdir/usr/lib mv $pkgdir/lib/*.a $pkgdir/usr/lib # to make the linker find the shared lib and fix compile issues Modified: inputrc =================================================================== --- inputrc 2010-11-20 09:55:40 UTC (rev 100092) +++ inputrc 2010-11-20 10:13:40 UTC (rev 100093) @@ -34,7 +34,3 @@ "\e[H": beginning-of-line "\e[F": end-of-line $endif - -# Include user-specific configuration -$include ~/.inputrc -
