diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2015-01-30 14:49:06 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2015-01-30 14:49:06 -0300 |
| commit | 1416490658fb1d376129a926572f34b6be8c3283 (patch) | |
| tree | e2336ed8d163eb63049f1a53fd91c68f62e768b6 /libre/pacman/PKGBUILD | |
| parent | 27aa494d6370c4193a98b2df3502d07ba655be68 (diff) | |
| parent | 518a74be94932936436dd22d85a0584c904d229e (diff) | |
| download | abslibre-1416490658fb1d376129a926572f34b6be8c3283.tar.gz abslibre-1416490658fb1d376129a926572f34b6be8c3283.tar.bz2 abslibre-1416490658fb1d376129a926572f34b6be8c3283.zip | |
Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre
Diffstat (limited to 'libre/pacman/PKGBUILD')
| -rw-r--r-- | libre/pacman/PKGBUILD | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index c6749f5b8..8ef4240df 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,5 +1,5 @@ # vim: set ts=2 sw=2 et: -# $Id: PKGBUILD 228108 2014-12-28 09:07:13Z allan $ +# $Id: PKGBUILD 228934 2015-01-12 05:54:31Z allan $ # Maintainer (Arch): Dan McGee <dan@archlinux.org> # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -9,7 +9,7 @@ pkgname=pacman pkgver=4.2.0 -pkgrel=5.parabola1 +pkgrel=6.parabola2 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -18,9 +18,8 @@ groups=('base' 'base-devel') depends=('bash' 'glibc' 'libarchive>=3.1.2' 'curl>=7.39.0' 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring' 'ca-certificates-cacert') -makedepends=('asciidoc') # build man pages +makedepends=('asciidoc') # roundup patch alters docs checkdepends=('python2' 'fakechroot') -optdepends=('fakeroot: for makepkg usage as normal user') provides=("$pkgname-contrib") conflicts=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org') replaces=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org') @@ -40,8 +39,8 @@ md5sums=('184ce14f1f326fede72012cca51bba51' '7279d086428df483fd60c33f7c88cf3e' 'a12b1a4533c170aecc8b9b8561048248' 'ce525a9af50f1d9b824806d2e5a4f0c8' - '8b8e478e3b6f785f6fb0029f792cea38' - '8c339b2bf027979d1edcfc6ac0e7e81d' + 'abe3baaf610d9cc42b4e3748c936bbce' + 'e86946908762aa44e8d3c582d4d872bb' '3cfc5d2867a6672f4f629220632948f4' '0ee98dc38ff80ba127772f5104e18e46' '093f0779ac55ae781ba028ad74b95f84') @@ -53,6 +52,10 @@ prepare() { # v4.2.0-13-gacc639a patch -p1 -i "$srcdir/pacman-4.2.0-roundup.patch" + # fix bad translation mistake - corrected in transifex + sed -i 's#pacman-db-update#pacman-db-upgrade#' src/pacman/po/nl.po + + # treat pkgrel more similarly to pkgver patch -p1 -i "$srcdir/makepkg-pkgrel-4.patch" } @@ -123,8 +126,8 @@ package() { "${pkgdir}/etc/cron.weekly/refresh-pacman-keys" install -Dm644 "${srcdir}/sks-keyservers.netCA.pem" \ - "${pkgdir}/etc/pacman.d/sks-keyservers.netCA.pem" + "${pkgdir}/etc/pacman.d/gnupg/sks-keyservers.netCA.pem" install -Dm644 "${srcdir}/gpg.conf" \ - "${pkgdir}/etc/pacman.d/gpg.conf" + "${pkgdir}/etc/pacman.d/gnupg/gpg.conf" } |