rpms/gnupg2/FC-6 .cvsignore, 1.17, 1.18 gnupg2.spec, 1.57, 1.58 sources, 1.19, 1.20

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/gnupg2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10922

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Fri May 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.4-1
- gnupg-2.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/FC-6/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Dec 2006 14:10:42 -0000	1.17
+++ .cvsignore	3 Jul 2007 10:14:23 -0000	1.18
@@ -1,3 +1,7 @@
 clog
-gnupg-2.0.1.tar.bz2
-gnupg-2.0.1.tar.bz2.sig
+gnupg-2.0.2.tar.bz2
+gnupg-2.0.2.tar.bz2.sig
+gnupg-2.0.3.tar.bz2
+gnupg-2.0.3.tar.bz2.sig
+gnupg-2.0.4.tar.bz2
+gnupg-2.0.4.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/FC-6/gnupg2.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnupg2.spec	6 Dec 2006 19:42:22 -0000	1.57
+++ gnupg2.spec	3 Jul 2007 10:14:23 -0000	1.58
@@ -1,7 +1,7 @@
 
 ## Keep an eye on http://bugzilla.redhat.com/175744, 
 ## in case these dirs go away or change
-%if "%{?fedora}" > "3" || "%{?rhel}" > "4"
+%if 0%{?fedora} > 3 || 0%{?rhel} > 4
 %define kde_scriptdir %{_sysconfdir}/kde
 %else
 %define kde_scriptdir %{_prefix}
@@ -9,8 +9,8 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.1
-Release: 2%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -24,9 +24,9 @@
 Source11: gpg-agent-shutdown.sh
 
 Patch1: gnupg-1.9.16-testverbose.patch
-Patch2: gnupg-2.0.1-CVE-2006-6235.patch
 
-Obsoletes: newpg < 0.9.5
+# ancient, deprecated
+#Obsoletes: newpg < 0.9.5
 
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
@@ -45,7 +45,7 @@
 BuildRequires: bzip2-devel
 Buildrequires: libusb-devel
 BuildRequires: docbook-utils
-%if "%{?fedora}" > "3"
+%if 0%{?fedora} > 3
 BuildRequires: pcsc-lite-libs
 %endif
 
@@ -82,14 +82,11 @@
 %setup -q -n gnupg-%{version}%{?beta}
 
 #patch1 -p1 -b .testverbose
-pushd g10
-%patch2 -p0 -b .CVE-2006-6235
-popd
 
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
 # Note: this is just the name of the default shared lib to load in scdaemon,
 # it can use other implementations too (including non-pcsc ones).
-%if "%{?fedora}" > "3"
+%if 0%{?fedora} > 3 || 0%{?rhel} > 4
 %global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.? 2>/dev/null ) 2>/dev/null )
 %else
 %define pcsclib libpcsclite.so.0
@@ -181,12 +178,21 @@
 
 
 %changelog
+* Fri May 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.4-1
+- gnupg-2.0.4
+
+* Thu Mar 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.3-1
+- gnupg-2.0.3
+
+* Fri Feb 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-1
+- gnupg-2.0.2
+
 * Wed Dec 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.1-2
-- CVE-2006-6235
+- CVE-2006-6235 (#219934)
 
 * Wed Nov 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.1-1
 - gnupg-2.0.1
-- CVE-2006-6169 (bug #217950)
+- CVE-2006-6169 (#217950)
 
 * Sat Nov 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.1-0.3.rc1
 - gnupg-2.0.1rc1 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/FC-6/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	1 Dec 2006 14:10:42 -0000	1.19
+++ sources	3 Jul 2007 10:14:23 -0000	1.20
@@ -1,2 +1,2 @@
-eb24e258db73f4cb53a3ce18375efa21  gnupg-2.0.1.tar.bz2
-58b1bbc2f34c0882ab1a49542a8ffd45  gnupg-2.0.1.tar.bz2.sig
+e16efce067ba132f933792a3ec7f180e  gnupg-2.0.4.tar.bz2
+5c92699afb465541b510d989617c9aa9  gnupg-2.0.4.tar.bz2.sig