- handle seahorse-agent, too

diff --git a/gnupg-agent.sh b/gnupg-agent.sh
index 68ec6f4260cd5d4607e35638f15a02e709bd2229..100ad8b0d5a202eccdaa1b5a190d52ba4ba0357d 100644 (file)
--- a/gnupg-agent.sh
+++ b/gnupg-agent.sh
@@ -14,7 +14,8 @@ 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)" && \
-                       [ "$(resolvesymlink "/proc/$pid/exe")" = "/usr/bin/gpg-agent" ]; then
+                       agent="$(resolvesymlink "/proc/$pid/exe")" && \
+                       [ "$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
@@ -26,5 +27,7 @@ if grep -q "^[[:blank:]]*use-agent" ${CFG} 2>/dev/null; then
                export GPG_AGENT_INFO
        fi
 fi
+unset agent
+unset seahorse
 unset CFG
 unset pid

diff --git a/gnupg2.spec b/gnupg2.spec
index 75b3a8d223090a43909e80dea817d90a8a9a7dff..555b6042db1f7023f77892c95397bc8dccd9c2b5 100644 (file)
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -7,7 +7,7 @@ Summary:        GNU Privacy Guard - tool for secure communication and data storage - en
 Summary(pl.UTF-8):     GnuPG - narzędzie do bezpiecznej komunikacji i bezpiecznego przechowywania danych - wersja rozszerzona
 Name:          gnupg2
 Version:       2.0.30
-Release:       1
+Release:       2
 License:       GPL v3+
 Group:         Applications/File
 Source0:       ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2