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

[Gaetan Bisson]

    Date: Wednesday, November 19, 2014 @ 23:42:34
  Author: bisson
Revision: 226741

fix FS#42798

Modified:
  gnupg/trunk/PKGBUILD
  gnupg/trunk/install

----------+
 PKGBUILD |    3 +--
 install  |   27 ++++++++++++++++-----------
 2 files changed, 17 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-19 21:38:32 UTC (rev 226740)
+++ PKGBUILD	2014-11-19 22:42:34 UTC (rev 226741)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -41,7 +41,6 @@
 		--sbindir=/usr/bin \
 		--libexecdir=/usr/lib/gnupg \
 		--enable-maintainer-mode \
-		--enable-standard-socket \
 		--enable-symcryptrun \
 		--enable-gpgtar \
 

Modified: install
===================================================================
--- install	2014-11-19 21:38:32 UTC (rev 226740)
+++ install	2014-11-19 22:42:34 UTC (rev 226741)
@@ -2,19 +2,24 @@
 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
+	[ -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
 }
 
-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
+post_upgrade() {
+	post_install
+
+	# Fix upgrade to 2.1; see FS#42798
+	[ $(vercmp $2 2.1.0-4) = -1 ] &&
+	dirmngr </dev/null &>/dev/null ||
+	return 0
 }