[arch-commits] Commit in gnupg/trunk (PKGBUILD gnupg.install install)

[Gaetan Bisson]

    Date: Tuesday, March 27, 2012 @ 16:03:53
  Author: bisson
Revision: 154400

upstream update

Added:
  gnupg/trunk/install
    (from rev 154399, gnupg/trunk/gnupg.install)
Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/gnupg.install

---------------+
 PKGBUILD      |   34 ++++++++++++++++++----------------
 gnupg.install |   21 ---------------------
 install       |   20 ++++++++++++++++++++
 3 files changed, 38 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-27 14:35:39 UTC (rev 154399)
+++ PKGBUILD	2012-03-27 20:03:53 UTC (rev 154400)
@@ -1,11 +1,12 @@
 # $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
 # Contributor: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=gnupg
-pkgver=2.0.18
-pkgrel=2
+pkgver=2.0.19
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -16,29 +17,30 @@
             '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')
+source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f'
+          'f6e6830610a8629b0aad69d789373bf8ca481733')
 
+install=install
+
 conflicts=('gnupg2')
 provides=("gnupg2=${pkgver}")
 replaces=('gnupg2')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr --libexecdir=/usr/lib/gnupg
+	make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make check
 }
 
 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
+	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
 }

Deleted: gnupg.install
===================================================================
--- gnupg.install	2012-03-27 14:35:39 UTC (rev 154399)
+++ gnupg.install	2012-03-27 20:03:53 UTC (rev 154400)
@@ -1,21 +0,0 @@
-info_dir=/usr/share/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 ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null
-  done
-}
-# vim:set ts=2 sw=2 et:

Copied: gnupg/trunk/install (from rev 154399, gnupg/trunk/gnupg.install)
===================================================================
--- install	                        (rev 0)
+++ install	2012-03-27 20:03:53 UTC (rev 154400)
@@ -0,0 +1,20 @@
+info_dir=/usr/share/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 ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null
+  done
+}