- rel 3; use readlink from coreutils instead of our own resolvesymlink; handle "gpg...

diff --git a/gnupg-agent.sh b/gnupg-agent.sh
index 100ad8b0d5a202eccdaa1b5a190d52ba4ba0357d..72dda0c7602e0fa745b06fd0cee346eb0f6c9333 100644 (file)
--- a/gnupg-agent.sh
+++ b/gnupg-agent.sh
@@ -14,7 +14,7 @@ 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="$(resolvesymlink "/proc/$pid/exe")" && \
+                       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

diff --git a/gnupg2.spec b/gnupg2.spec
index 555b6042db1f7023f77892c95397bc8dccd9c2b5..8efc42fc2ca52b0d83855eb222ce956aa1358c7b 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:       2
+Release:       3
 License:       GPL v3+
 Group:         Applications/File
 Source0:       ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2