rpms/gnupg2/FC-4 gnupg2.spec, 1.20, 1.21 gpg-agent-startup.sh, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28370

Modified Files:
	gnupg2.spec gpg-agent-startup.sh 
Log Message:
* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-7
- gpg-agent-startup.sh: fix case where valid .gpg-agent-info exists

* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-6
- fix "syntax error in gpg-agent-startup.sh" (#206887)




Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-4/gnupg2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnupg2.spec	31 Jul 2006 13:59:45 -0000	1.20
+++ gnupg2.spec	18 Sep 2006 13:51:29 -0000	1.21
@@ -1,6 +1,6 @@
 
-# Keep an eye on http://bugzilla.redhat.com/bugzilla/175744, in case these dirs go away or change
-%if "%{?fedora}" > "3"
+# Keep an eye on http://bugzilla.redhat.com/175744, in case these dirs go away or change
+%if "%{?fedora}" > "3" || "%{?rhel}" > "4"
 %define kde_scriptdir %{_sysconfdir}/kde
 %else
 %define kde_scriptdir %{_prefix}
@@ -16,7 +16,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.22
-Release: 1%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -58,6 +58,8 @@
 BuildRequires: pcsc-lite-libs
 %endif
 
+# sed/kill used in gpg-agent-(startup/shutdown).sh
+Requires: fileutils util-linux
 Requires: pinentry >= 0.7.1
 
 %if "%{?_enable_gpg:1}" == "1"
@@ -170,6 +172,18 @@
 
 
 %changelog
+* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-7
+- gpg-agent-startup.sh: fix case where valid .gpg-agent-info exists
+
+* Mon Sep 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-6
+- fix "syntax error in gpg-agent-startup.sh" (#206887)
+
+* Thu Sep 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-3
+- fc6 respin (for libksba-1.0)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-2
+- fc6 respin
+
 * Fri Jul 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.22-1
 - 1.9.22
 


Index: gpg-agent-startup.sh
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-4/gpg-agent-startup.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gpg-agent-startup.sh	22 Jun 2006 16:56:34 -0000	1.2
+++ gpg-agent-startup.sh	18 Sep 2006 13:51:29 -0000	1.3
@@ -2,22 +2,23 @@
 
 GPG_AGENT=/usr/bin/gpg-agent
 ## Run gpg-agent only if not already running, and available
-if [ -z "${GPG_AGENT_INFO}" -a -x ${GPG_AGENT} ] ; then
+if [ -z "${GPG_AGENT_INFO}" -a -x "${GPG_AGENT}" ] ; then
 
   # check validity of GPG_SOCKET (in case of session crash)
-  if [ -f ${HOME}/.gpg-agent-info ]; then
-    GPG_SOCKET=$(cat .gpg-agent-info |cut -f1 -d:)
-    if ! test -S ${GPG_SOCKET} -o ! test -O ${GPG_SOCKET} ; then
-      rm -f ${HOME}/.gpg-agent-info 2>&1 >/dev/null
+  GPG_AGENT_INFO_FILE=${HOME}/.gpg-agent-info
+  if [ -f "${GPG_AGENT_INFO_FILE}" ]; then
+    GPG_SOCKET=$(cat "${GPG_AGENT_INFO_FILE}" | cut -f1 -d:)
+    if ! test -S "${GPG_SOCKET}" -a -O "${GPG_SOCKET}" ; then
+      rm -f "${GPG_AGENT_INFO_FILE}" 2>&1 >/dev/null
     fi
   fi
 
-  if [ -f ${HOME}/.gpg-agent-info ]; then
-    export GPG_AGENT_INFO=$(cat ${HOME}/.gpg-agent-info)
+  if [ -f "${GPG_AGENT_INFO_FILE}" ]; then
+    export GPG_AGENT_INFO=$(cat "${GPG_AGENT_INFO_FILE}")
     export GPG_TTY=$(tty)
   else
     eval "$(${GPG_AGENT} -s --daemon ${GPG_OPTIONS})"
-    echo ${GPG_AGENT_INFO} > ${HOME}/.gpg-agent-info
+    echo ${GPG_AGENT_INFO} > "${HOME}/.gpg-agent-info"
   fi
 
 fi