rpms/gnupg2/FC-3 .cvsignore, 1.4, 1.5 gnupg2.spec, 1.8, 1.9 sources, 1.5, 1.6

[Rex Dieter (rdieter)]

Author: rdieter

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

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-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Aug 2005 19:05:09 -0000	1.4
+++ .cvsignore	31 Oct 2005 16:22:47 -0000	1.5
@@ -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-3/gnupg2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnupg2.spec	8 Aug 2005 20:29:57 -0000	1.8
+++ gnupg2.spec	31 Oct 2005 16:22:47 -0000	1.9
@@ -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: 5%{?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
@@ -22,16 +23,15 @@
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-%{!?_without_pie:%define _with_pie --with pie} 
-
 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
@@ -69,13 +69,19 @@
 %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
 
 
 %build
 
-%{?_with_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS}
-%{?_with_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG}
+%{!?_without_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS}
+%{!?_without_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG}
 
 %configure \
   --disable-dependency-tracking \
@@ -96,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
 
 
@@ -136,6 +142,21 @@
 
 
 %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)
+
 * Mon Aug  8 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.18-5
 - 1.9.18
 - drop pth patch (--enable-gpg build fixed)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Aug 2005 19:05:09 -0000	1.5
+++ sources	31 Oct 2005 16:22:47 -0000	1.6
@@ -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