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

[Gaëtan Bisson]

    Date: Saturday, June 16, 2018 @ 05:37:18
  Author: bisson
Revision: 327011

implement FS#58979

Modified:
  pinentry/trunk/PKGBUILD
  pinentry/trunk/pinentry

----------+
 PKGBUILD |   10 ++++++----
 pinentry |    5 ++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-15 21:29:58 UTC (rev 327010)
+++ PKGBUILD	2018-06-16 05:37:18 UTC (rev 327011)
@@ -4,7 +4,7 @@
 
 pkgname=pinentry
 pkgver=1.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol'
 url='http://gnupg.org/related_software/pinentry/'
 arch=('x86_64')
@@ -14,13 +14,15 @@
 optdepends=('gtk2: gtk2 backend'
             'qt5-base: qt backend'
             'gcr: gnome3 backend')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6')
 source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
         'pinentry')
 sha256sums=('68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570'
             'SKIP'
-            '95f298d20fce379ca6ac696b269ae4d276372e07c3e90e2d473dd8d14d5b682d')
-validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6')
+            '4f51d67c8cf92f2bb535e07d2ba7dc8972535dae077c678102a34fb87f3b3a9c')
 
+backup=('usr/bin/pinentry')
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \
@@ -40,5 +42,5 @@
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install -Dt "${pkgdir}/usr/bin" ../pinentry
+	install ../pinentry "${pkgdir}/usr/bin/pinentry"
 }

Modified: pinentry
===================================================================
--- pinentry	2018-06-15 21:29:58 UTC (rev 327010)
+++ pinentry	2018-06-16 05:37:18 UTC (rev 327011)
@@ -1,3 +1,6 @@
 #!/bin/sh
-test -e /usr/lib/libgtk-x11-2.0.so.0 && exec /usr/bin/pinentry-gtk-2  "$@"
+
+test -e /usr/lib/libgtk-x11-2.0.so.0 &&
+exec /usr/bin/pinentry-gtk-2  "$@"
+
 exec /usr/bin/pinentry-curses "$@"