diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-20 15:39:19 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-20 15:39:19 +0200 |
| commit | f201c0c97570e91af0fcec400d827a3f1bba79cc (patch) | |
| tree | 6b87f10653f54a3b7294d3f2028704e323849781 /core | |
| parent | f97d206e9152e1d29ad8fb9f2ea2aee95f1da625 (diff) | |
| parent | 947c2e7bbbd5942492024997d34d709d436f1c8f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/python/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
testing/colord/PKGBUILD
testing/epiphany/PKGBUILD
testing/fcitx/PKGBUILD
testing/folks/PKGBUILD
testing/gcalctool/PKGBUILD
testing/gcc/PKGBUILD
testing/gnome-games/PKGBUILD
testing/gnome-shell/PKGBUILD
testing/mutter/PKGBUILD
testing/yelp/PKGBUILD
Diffstat (limited to 'core')
| -rw-r--r-- | core/keyutils/PKGBUILD | 12 | ||||
| -rw-r--r-- | core/popt/PKGBUILD | 16 |
2 files changed, 9 insertions, 19 deletions
diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD index 5a9db6545..65d6a8718 100644 --- a/core/keyutils/PKGBUILD +++ b/core/keyutils/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 144590 2011-12-07 12:54:45Z stephane $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 156455 2012-04-18 12:20:44Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=keyutils pkgver=1.5.5 -pkgrel=1 +pkgrel=2 pkgdesc="Linux Key Management Utilities" arch=(i686 x86_64 'mips64el') url="http://www.kernel.org" @@ -10,15 +11,14 @@ license=('GPL2' 'LGPL2.1') depends=('glibc' 'sh') backup=(etc/request-key.conf) source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('9e8ab5164bc8f84be148761cc89e9d6f') +md5sums=('d759680b2f23c99af95938f5026f25fb') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i "s|/lib64|/lib|g" Makefile make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" LIBDIR="/usr/lib" USRLIBDIR="/usr/lib" install } diff --git a/core/popt/PKGBUILD b/core/popt/PKGBUILD index 09ec1ca1a..504665858 100644 --- a/core/popt/PKGBUILD +++ b/core/popt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142191 2011-11-06 02:28:05Z stephane $ +# $Id: PKGBUILD 156453 2012-04-18 12:20:42Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -7,7 +7,7 @@ pkgname=popt pkgver=1.16 -pkgrel=4 +pkgrel=5 pkgdesc="A commandline option parser" arch=('i686' 'x86_64' 'mips64el') url="http://rpm5.org" @@ -15,7 +15,7 @@ license=('custom') depends=('glibc') options=('!libtool') source=(http://rpm5.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('3743beefa3dd6247a73f8f7a32c14c33') +sha1sums=('cfe94a15a2404db85858a81ff8de27c8ff3e235e') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,15 +28,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - # move libs in /lib - install -Dm755 "${pkgdir}"/usr/lib/libpopt.so.0.0.0 \ - ${pkgdir}/lib/libpopt.so.0.0.0 - - rm "${pkgdir}"/usr/lib/libpopt.so* - ln -sf /lib/libpopt.so "${pkgdir}"/usr/lib/libpopt.so - ln -sf libpopt.so.0 "${pkgdir}"/lib/libpopt.so - ln -sf libpopt.so.0.0.0 "${pkgdir}"/lib/libpopt.so.0 - - # install license install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } |