From aab2acb57125a97d529782c515b7c72a5bf923d8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Sun, 6 May 2018 11:56:49 +0200
Subject: [PATCH] - rel 2; drop seahorse-agent support (seahorse doesn't
 provide such binary); launch gpg-agent using new, 2.1/2.2 way

---
 gnupg-agent.sh | 24 ++----------------------
 gnupg2.spec    |  3 +--
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/gnupg-agent.sh b/gnupg-agent.sh
index 72dda0c..6b2dadb 100644
--- a/gnupg-agent.sh
+++ b/gnupg-agent.sh
@@ -6,28 +6,8 @@ else
 	CFG="${HOME}/.gnupg/options"
 fi
 
-seahorse=no
-if [ -r "${HOME}/.gnupg/gpg-agent.conf" ]; then
-	grep -qE "^[[:blank:]]*pinentry-program[[:blank:]]*.*seahorse-agent" "${HOME}/.gnupg/gpg-agent.conf" && seahorse=yes
-fi
-
 if grep -q "^[[:blank:]]*use-agent" ${CFG} 2>/dev/null; then
-	if [ -f "${HOME}/.gnupg/GPG_AGENT_INFO" ] && \
-			pid="$(cut -d: -f2 $HOME/.gnupg/GPG_AGENT_INFO)" && \
-			agent="$(readlink -n "/proc/$pid/exe")" && agent=${agent%% *} && \
-			[ "$agent" = "/usr/bin/gpg-agent" -o "$agent" = "/usr/bin/seahorse-agent" ]; then
-		export GPG_AGENT_INFO="$(cat ${HOME}/.gnupg/GPG_AGENT_INFO)"
-	else
-		if [ "$seahorse" = "no" ]; then
-			eval "$(gpg-agent --daemon)"
-		else
-			eval "$(seahorse-agent --variables)"
-		fi
-		echo $GPG_AGENT_INFO > ~/.gnupg/GPG_AGENT_INFO
-		export GPG_AGENT_INFO
-	fi
+	/usr/bin/gpgconf --launch gpg-agent
 fi
-unset agent
-unset seahorse
+
 unset CFG
-unset pid
diff --git a/gnupg2.spec b/gnupg2.spec
index e946ee3..703ef27 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -9,9 +9,8 @@
 Summary:	GNU Privacy Guard - tool for secure communication and data storage - enhanced version
 Summary(pl.UTF-8):	GnuPG - narzędzie do bezpiecznej komunikacji i bezpiecznego przechowywania danych - wersja rozszerzona
 Name:		gnupg2
-# 2.1.x is development version unfortunately (see gpg2 --version)
 Version:	2.2.7
-Release:	1
+Release:	2
 License:	GPL v3+
 Group:		Applications/File
 Source0:	ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
-- 
2.43.0