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

[Gaetan Bisson]

    Date: Thursday, December 24, 2015 @ 05:01:30
  Author: bisson
Revision: 257237

fix FS#47371

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

----------+
 PKGBUILD |    2 +-
 install  |    8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-23 19:28:07 UTC (rev 257236)
+++ PKGBUILD	2015-12-24 04:01:30 UTC (rev 257237)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.10
-pkgrel=2
+pkgrel=3
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')

Modified: install
===================================================================
--- install	2015-12-23 19:28:07 UTC (rev 257236)
+++ install	2015-12-24 04:01:30 UTC (rev 257237)
@@ -2,6 +2,9 @@
 info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
 
 post_install() {
+	# See FS#42798 and FS#47371
+	dirmngr </dev/null &>/dev/null
+
 	[ -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
@@ -17,9 +20,4 @@
 
 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
 }