rpms/gnupg2/devel gnupg-1.9.15.tar.bz2.sig, NONE, 1.1 gnupg2.spec, 1.1, 1.2 sources, 1.2, 1.3 gnupg-1.9.14.tar.bz2.sig, 1.1, NONE gnupg-1.9.4-gpg-error.patch, 1.1, NONE

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv3400

Modified Files:
	gnupg2.spec sources 
Added Files:
	gnupg-1.9.15.tar.bz2.sig 
Removed Files:
	gnupg-1.9.14.tar.bz2.sig gnupg-1.9.4-gpg-error.patch 
Log Message:
Merge post-1.9.14-0.fdr.1 changes from Rex.


--- NEW FILE gnupg-1.9.15.tar.bz2.sig ---
ˆ?

Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnupg2.spec	1 Feb 2005 22:40:35 -0000	1.1
+++ gnupg2.spec	2 Feb 2005 17:20:20 -0000	1.2
@@ -3,17 +3,15 @@
 Summary: GNU utility for secure communication and data storage
 Name:	 gnupg2 
 Epoch:	 0 
-Version: 1.9.14
+Version: 1.9.15
 Release: 1%{?dist_tag}
 License: GPL
 Group: 	 Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-1.9.14.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-1.9.14.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
 URL:	 http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Patch1: gnupg-1.9.4-gpg-error.patch
-
 Obsoletes: newpg < 0:0.9.5
 
 Requires(post): /sbin/install-info
@@ -26,18 +24,22 @@
 %define pie 1
 %endif
 
-BuildRequires: openldap-devel, zlib-devel, gettext
 BuildRequires: libgcrypt-devel => 0:1.2.0
-BuildRequires: libgpg-error-devel => 0:0.7
+BuildRequires: libgpg-error-devel => 1.0
+Requires: libgpg-error >= 1.0
 BuildRequires: libassuan-devel >= 0.6.9
 BuildRequires: libksba-devel >= 0:0.9.7
 # to build without opensc support: --without opensc
 %{!?_without_opensc:BuildRequires: opensc-devel >= 0.9}
+%{!?_without_opensc:BuildRequires: pcsc-lite-devel }
 %{?_without_opensc:BuildConflicts: opensc-devel }
 
+BuildRequires: gettext
+BuildRequires: openldap-devel
 BuildRequires: libusb-devel
 BuildRequires: pth-devel
-BuildRequires: zlib-devel, bzip2-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
 Buildrequires: libusb-devel
 BuildRequires: docbook-utils
 
@@ -62,8 +64,6 @@
 %prep
 %setup -q -n gnupg-%{version}
 
-%patch1 -p1 -b .gpg-error
-
 
 %build
 
@@ -75,6 +75,7 @@
   --disable-rpath 
 
 make %{?_smp_mflags}
+
 make check
 
 
@@ -123,9 +124,15 @@
 
 
 %changelog
-* Tue Feb  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.9.14-1
+* Tue Feb  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.9.15-1
 - Make install-info in scriptlets less noisy.
 
+* Tue Jan 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.15-0.fdr.1
+- 1.9.15
+
+* Fri Jan 07 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.14-0.fdr.2
+- note patch/hack to build against older ( <1.0) libgpg-error-devel
+
 * Thu Jan 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.14-0.fdr.1
 - 1.9.14
 - enable opensc support


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Feb 2005 22:40:35 -0000	1.2
+++ sources	2 Feb 2005 17:20:20 -0000	1.3
@@ -1 +1 @@
-fd121b7d368cf27928bfa4ef4e4cc982  gnupg-1.9.14.tar.bz2
+7b1d0562b66b1853b77d511feb786629  gnupg-1.9.15.tar.bz2


--- gnupg-1.9.14.tar.bz2.sig DELETED ---


--- gnupg-1.9.4-gpg-error.patch DELETED ---