From c22bdac2113b4099c60f0caeedc6e30b3b1f78fe Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Jun 22 2006 16:02:58 +0000
Subject: Release++ due to my devel branch still thinking it's fc5 drop cvs Id: tags

    from shell scripts

---

diff --git a/gnupg2.spec b/gnupg2.spec
index a1ab220..a7ef000 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.21
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -163,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Jun 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.21-1
+* Thu Jun 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.21-2
 - 1.9.21
 - omit gpg2 binary to address CVS-2006-3082 (#196190)
 
diff --git a/gpg-agent-shutdown.sh b/gpg-agent-shutdown.sh
index 5ecc6e3..aab44cb 100755
--- a/gpg-agent-shutdown.sh
+++ b/gpg-agent-shutdown.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id: gpg-agent-shutdown.sh,v 1.3 2004/12/09 14:27:31 rexdieter Exp $
 
 ## The nice way
 if test -n "${GPG_AGENT_INFO}"; then
diff --git a/gpg-agent-startup.sh b/gpg-agent-startup.sh
index 560a56d..bddbd9d 100755
--- a/gpg-agent-startup.sh
+++ b/gpg-agent-startup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
-# $Id$
 
-GPG_AGENT=$(which gpg-agent)
+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 [ -f ${HOME}/.gpg-agent-info ]; then