- rel 2; drop seahorse-agent support (seahorse doesn't provide such binary); launch...

diff --git a/gnupg-agent.sh b/gnupg-agent.sh
index 72dda0c7602e0fa745b06fd0cee346eb0f6c9333..6b2dadbf81493c6027ea59f6e6120e12afba5bea 100644 (file)
--- 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 e946ee3252bdc90c32ec75188cc329e4c12ecdd5..703ef272dc8265fa066656ee4e41ba07a63c8542 100644 (file)
--- 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