rpms/gnupg2/FC-4 .cvsignore, 1.5, 1.6 gnupg2.spec, 1.13, 1.14 sources, 1.6, 1.7

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Tue Oct 11 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.19-2
- back to BR: libksba-devel = 1.9.11

* Tue Oct 11 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.19-1
- 1.9.19

* Fri Aug 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.18-9
- configure: NEED_KSBA_VERSION=0.9.12 -> 0.9.11

* Fri Aug 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.18-7
- re-enable 'make check', rebuild against (older) libksba-0.9.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Aug 2005 16:12:05 -0000	1.5
+++ .cvsignore	31 Oct 2005 16:20:45 -0000	1.6
@@ -1,2 +1,2 @@
-gnupg-1.9.18.tar.bz2
-gnupg-1.9.18.tar.bz2.sig
+gnupg-1.9.19.tar.bz2
+gnupg-1.9.19.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-4/gnupg2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnupg2.spec	9 Aug 2005 16:06:26 -0000	1.13
+++ gnupg2.spec	31 Oct 2005 16:20:45 -0000	1.14
@@ -1,3 +1,4 @@
+
 # 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).
@@ -5,8 +6,8 @@
 
 Summary: GNU utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.18
-Release: 6%{?dist}
+Version: 1.9.19
+Release: 2%{?dist}
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
@@ -25,11 +26,12 @@
 BuildRequires: libassuan-devel >= 0.6.10
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.0
-# We can probably get away without this explicit Requires: now. -- Rex
-#Requires: libgpg-error >= 1.0
-BuildRequires: libksba-devel >= 0.9.12
-# No longer used (?) -- Rex
-#BuildRequires: opensc-devel >= 0.9
+%ifarch x86_64
+# Hard-code libksba-0.9.11 for now (x86_64 issues)
+BuildRequires: libksba-devel = 0.9.11
+%else
+BuildRequires: libksba-devel >= 0.9.11
+%endif
 
 BuildRequires: gettext
 BuildRequires: openldap-devel
@@ -67,6 +69,12 @@
 %patch1 -p1 -b .lvalue
 %patch2 -p1 -b .testverbose
 
+
+#ifarch x86_64
+sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac
+sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure
+#endif
+
 sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
 
@@ -84,7 +92,7 @@
 
 
 %check || :
-%{?_with_check:make check}
+make check
 
 
 %install
@@ -94,16 +102,16 @@
 
 %find_lang %{name}
 
+## Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 
 %post
-/sbin/install-info %{_infodir}/gnupg.info %{_infodir}/dir 2>/dev/null ||:
+/sbin/install-info %{_infodir}/gnupg.info %{_infodir}/dir ||:
 
 %preun
 if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete %{_infodir}/gnupg.info %{_infodir}/dir \
-    2>/dev/null ||:
+  /sbin/install-info --delete %{_infodir}/gnupg.info %{_infodir}/dir ||:
 fi
 
 
@@ -134,6 +142,18 @@
 
 
 %changelog
+* Tue Oct 11 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.19-2
+- back to BR: libksba-devel = 1.9.11
+
+* Tue Oct 11 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.19-1
+- 1.9.19
+
+* Fri Aug 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.18-9
+- configure: NEED_KSBA_VERSION=0.9.12 -> 0.9.11
+
+* Fri Aug 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.18-7
+- re-enable 'make check', rebuild against (older) libksba-0.9.11
+
 * Tue Aug  9 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.18-6
 - don't 'make check' by default (regular builds pass, but FC4/5+plague fails)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Aug 2005 16:12:05 -0000	1.6
+++ sources	31 Oct 2005 16:20:45 -0000	1.7
@@ -1,2 +1,2 @@
-221d843dc23b4f33cdb8a91788a00e4d  gnupg-1.9.18.tar.bz2
-0026e7686e0efb106743d58c17afffb5  gnupg-1.9.18.tar.bz2.sig
+8084256a61aa90e0173d436bf1e6f82b  gnupg-1.9.19.tar.bz2
+9646e2b0f68474c5b1c8d37a09fb56d1  gnupg-1.9.19.tar.bz2.sig