Thu Mar 29 00:01:17 UTC 2012

2 files changed, 36 insertions, 28 deletions

diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD
index b6419c832..39c901d19 100644
--- a/core/gnupg/PKGBUILD
+++ b/core/gnupg/PKGBUILD
@@ -1,36 +1,44 @@
-# $Id: PKGBUILD 148992 2012-02-05 12:21:23Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
+# $Id: PKGBUILD 154386 2012-03-27 12:00:15Z bisson $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+
 pkgname=gnupg
-pkgver=1.4.12
-pkgrel=1
-pkgdesc="GNU Privacy Guard - a PGP replacement tool"
+pkgver=2.0.18
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
 arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('zlib' 'bzip2' 'libldap>=2.4.18' 'libusb-compat' 'curl>=7.16.2' 'readline>=6.0.00')
-source=(ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/$pkgname-$pkgver.tar.bz2)
-install=gnupg.install
-url="http://www.gnupg.org/"
-md5sums=('ce3742e5c7912559cab7894ad8ba7f6b')
+optdepends=('curl: gpg2keys_curl'
+            'libldap: gpg2keys_ldap'
+            'libusb-compat: scdaemon'
+            'texinfo: documentation')
+makedepends=('curl' 'libldap' 'libusb-compat' 'texinfo')
+depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr')
+install=${pkgname}.install
+source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2{,.sig})
+sha1sums=('5ec2f718760cc3121970a140aeea004b64545c46'
+          'c1b15a6c204434081e2bd8249dde233b6c88c4d0')
+
+conflicts=('gnupg2')
+provides=("gnupg2=${pkgver}")
+replaces=('gnupg2')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--libexecdir=/usr/lib \
-	--enable-noexecstack
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg
   make
-  #ln -s ${pkgname}-${pkgver}/scripts .. # seems obsolete now
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check #All 27 tests passed
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
 }
 
-package () {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  
-  # fix fileconflict with gnupg2 pkg
-  rm ${pkgdir}/usr/share/man/man1/gpg-zip.1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+  ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
 }
diff --git a/core/gnupg/gnupg.install b/core/gnupg/gnupg.install
index 5a6704716..0a6f3d518 100644
--- a/core/gnupg/gnupg.install
+++ b/core/gnupg/gnupg.install
@@ -1,10 +1,10 @@
 info_dir=/usr/share/info
-info_files=(gnupg1.info)
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0
   for f in ${info_files[@]}; do
-    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+    usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null
   done
 }
 
@@ -15,7 +15,7 @@ post_upgrade() {
 pre_remove() {
   [ -x usr/bin/install-info ] || return 0
   for f in ${info_files[@]}; do
-    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+    usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null
   done
 }
 # vim:set ts=2 sw=2 et: