diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-26 10:54:14 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-26 10:54:14 -0300 |
| commit | 38e7e59a562c5f8ea83719e4dfd5cd4c9917d5b1 (patch) | |
| tree | 8097f94554cc6e2c64d19db24e56e70e041e7757 /core | |
| parent | 328b5407de9f088d32c429b1b37f6efde3da06f8 (diff) | |
| parent | 7d3e94229ca9849421d263542eb2c61f64a91c10 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bird/PKGBUILD
community/gmic/PKGBUILD
community/linux-tools/PKGBUILD
community/linux-tools/cpupower.systemd
community/linux-tools/usbipd.service
community/macchanger/PKGBUILD
community/ndisc6/PKGBUILD
community/nemiver/PKGBUILD
core/gpgme/PKGBUILD
extra/amarok/PKGBUILD
extra/java-commons-daemon/PKGBUILD
extra/libao/PKGBUILD
extra/liblastfm/PKGBUILD
Diffstat (limited to 'core')
| -rw-r--r-- | core/gnupg/PKGBUILD | 7 | ||||
| -rw-r--r-- | core/gpgme/PKGBUILD | 4 | ||||
| -rw-r--r-- | core/gpgme/gpgme.install | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index 3ad7f8ef5..2f48266bb 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173102 2012-12-11 00:42:05Z bisson $ +# $Id: PKGBUILD 175919 2013-01-25 01:06:48Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -6,7 +6,7 @@ pkgname=gnupg pkgver=2.0.19 -pkgrel=3 +pkgrel=4 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' license=('GPL') @@ -44,6 +44,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install ln -s gpg2 "${pkgdir}"/usr/bin/gpg - ln -s gpg2 "${pkgdir}"/usr/bin/gpgv + ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz + rm "${pkgdir}/usr/share/gnupg/com-certs.pem" # FS#33059 } diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD index 2b073b1c3..b8110e0e2 100644 --- a/core/gpgme/PKGBUILD +++ b/core/gpgme/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 154388 2012-03-27 12:00:19Z bisson $ +# $Id: PKGBUILD 175920 2013-01-25 01:06:49Z bisson $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=gpgme pkgver=1.3.1 -pkgrel=4.1 +pkgrel=5 pkgdesc="A C wrapper library for GnuPG" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnupg.org/related_software/gpgme/" diff --git a/core/gpgme/gpgme.install b/core/gpgme/gpgme.install index b54620d9a..cd0db94e0 100644 --- a/core/gpgme/gpgme.install +++ b/core/gpgme/gpgme.install @@ -1,9 +1,10 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(gpgme.info gpgme.info-1 gpgme.info-2) post_install() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + install-info $infodir/$file.gz $infodir/dir 2> /dev/null done } @@ -12,7 +13,8 @@ post_upgrade() { } pre_remove() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } |