rpms/gnupg2/FC-3 .cvsignore, 1.2, 1.3 gnupg2.spec, 1.3, 1.4 sources, 1.3, 1.4 gnupg-1.9.15.tar.bz2.sig, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore gnupg2.spec sources 
Removed Files:
	gnupg-1.9.15.tar.bz2.sig 
Log Message:
* Mon Aug  8 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.18-1
- 1.9.18
- drop pth patch (--enable-gpg build fixed)
- update description (from README)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Feb 2005 22:40:35 -0000	1.2
+++ .cvsignore	8 Aug 2005 20:22:27 -0000	1.3
@@ -1 +1 @@
-gnupg-1.9.14.tar.bz2
+gnupg-1.9.18.tar.bz2


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/gnupg2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnupg2.spec	2 Jul 2005 08:26:44 -0000	1.3
+++ gnupg2.spec	8 Aug 2005 20:22:27 -0000	1.4
@@ -1,38 +1,43 @@
-# $Id$
+# 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).
+%define pcsc_lib libpcsclite.so.0
 
 Summary: GNU utility for secure communication and data storage
-Name:	 gnupg2 
-Epoch:	 0 
-Version: 1.9.15
+Name:    gnupg2
+Version: 1.9.18
 Release: 1%{?dist}
 License: GPL
-Group: 	 Applications/System
+Group:   Applications/System
 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
+URL:     http://www.gnupg.org/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Obsoletes: newpg < 0:0.9.5
+Patch1: gnupg-1.9.18-lvalue.patch
+Patch2: gnupg-1.9.16-testverbose.patch
+
+Obsoletes: newpg < 0.9.5
 
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-## gcc version in use?
+# Build with -pie/-fPIE?
 BuildRequires: gcc
-%define gcc_ver %(rpm -q --qf '%%{version}' gcc )
-%if "%{gcc_ver}" >= "3.2.3"
-%define pie 1
+%define gcc_ver %(gcc -dumpversion)
+%if "%{gcc_ver}" < "3.2.3"
+%define _without_pie --without pie 
 %endif
+%{!?_without_pie:%define _with_pie --with pie} 
 
-BuildRequires: libgcrypt-devel => 0:1.2.0
+BuildRequires: libassuan-devel >= 0.6.10
+BuildRequires: libgcrypt-devel => 1.2.0
 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 }
+# 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
 
 BuildRequires: gettext
 BuildRequires: openldap-devel
@@ -43,44 +48,51 @@
 Buildrequires: libusb-devel
 BuildRequires: docbook-utils
 
-Requires: pinentry >= 0:0.7.1
+Requires: pinentry >= 0.7.1
 
 # Should these be versioned?  -- Rex
-Provides: gpg 
-Provides: openpgp 
+Provides: gpg
+Provides: openpgp
 
 %description
-GnuPG 1.9 is the future version of GnuPG; it is based on the gnupg-1.3
+GnuPG 1.9 is the future version of GnuPG; it is based on some gnupg-1.3
 code and the previous newpg package.  It will eventually lead to a
-GnuPG 2.0 release.  Note that GnuPG 1.3 and 1.9 are not always in sync
-and thus features and bug fixes done in 1.3 are not necessary
+GnuPG 2.0 release.  Note that GnuPG 1.4 and 1.9 are not always in sync
+and thus features and bug fixes done in 1.4 are not necessarily
 available in 1.9.
 
 You should use this GnuPG version if you want to use the gpg-agent or
 gpgsm (the S/MIME variant of gpg).  Note that the gpg-agent is also
-helpful when using the standard gpg versions (1.2.x or 1.3.x).
+helpful when using the standard gpg versions (1.4.x as well as some of
+the old 1.2.x).  There are no problems installing 1.4 and 1.9
+alongside; in act we suggest to do this.
+
 
 
 %prep
 %setup -q -n gnupg-%{version}
 
+%patch1 -p1 -b .lvalue
+%patch2 -p1 -b .testverbose
+
+sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c
+
 
 %build
 
-%{?pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS}
-%{?pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG}
+%{?_with_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS}
+%{?_with_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG}
 
 %configure \
-  --program-prefix="%{?_program_prefix}" \
-  --disable-rpath 
+  --disable-dependency-tracking \
+  --disable-rpath \
+  --enable-gpg
 
 make %{?_smp_mflags}
 
-make check
-
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%check || :
+make check
 
 
 %install
@@ -94,11 +106,11 @@
 
 
 %post
-/sbin/install-info %{_infodir}/gnupg.info.gz %{_infodir}/dir 2>/dev/null ||:
+/sbin/install-info %{_infodir}/gnupg.info %{_infodir}/dir 2>/dev/null ||:
 
 %preun
 if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete %{_infodir}/gnupg.info.gz %{_infodir}/dir \
+  /sbin/install-info --delete %{_infodir}/gnupg.info %{_infodir}/dir \
     2>/dev/null ||:
 fi
 
@@ -106,24 +118,65 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+#docs say to install suid root, but we won't, for now.
 #attr(4755,root,root) %{_bindir}/gpg2
 %{_bindir}/gpg2
+%{_bindir}/gpgv2
+%{_datadir}/gnupg
+%{_bindir}/gpg-connect-agent
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
+%{_bindir}/gpgkey2ssh
 %{_bindir}/gpgsm*
-%{_bindir}/gpgv2
 %{_bindir}/kbxutil
-%{_bindir}/sc-copykeys
 %{_bindir}/scdaemon
 %{_bindir}/watchgnupg
 %{_sbindir}/*
-%{_datadir}/gnupg
 %{_libdir}/gnupg
 %{_libexecdir}/*
 %{_infodir}/*
 
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
 %changelog
+* Mon Aug  8 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.18-1
+- 1.9.18
+- drop pth patch (--enable-gpg build fixed)
+- update description (from README)
+
+* Fri Jul  1 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.9.17-1
+- 1.9.17, signal info patch applied upstream (#162264).
+- Patch to fix lvalue build error with gcc4 (upstream #485).
+- Patch scdaemon and pcsc-wrapper to load the versioned (non-devel)
+  pcsc-lite lib by default.
+
+* Fri May 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.16-3
+- Include upstream's patch for signal.c.
+
+* Tue May 10 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.16-1
+- Merge changes from Rex's 1.9.16-1 (Thu Apr 21):
+-   opensc support unconditional
+-   remove hard-coded .gz from %%post/%%postun
+-   add %%check section
+-   add pth patch
+- Put back patch modified from 1.9.15-4 to make tests verbose
+  and change signal.c to describe received signals better.
+
+* Sun May  8 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- Drop patch0 again.
+
+* Sun May  8 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.15-4
+- Add patch0 temporarily to get some output from failing test.
+
+* Sat May  7 2005 David Woodhouse <dwmw2 at infradead.org> 1.9.15-3
+- Rebuild.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Tue Feb  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.9.15-1
 - Make install-info in scriptlets less noisy.
 
@@ -139,7 +192,7 @@
 - BR: libassuan-devel >= 0.6.9
 
 * Thu Oct 21 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.11-0.fdr.4
-- remove suid. 
+- remove suid.
 
 * Thu Oct 21 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.11-0.fdr.3
 - remove Provides: newpg
@@ -150,6 +203,6 @@
 - update description
 
 * Tue Oct 19 2004 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.11-0.fdr.1
-- first try 
+- first try
 - leave out opensc support (for now), enable --with-opensc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Feb 2005 17:20:20 -0000	1.3
+++ sources	8 Aug 2005 20:22:27 -0000	1.4
@@ -1 +1 @@
-7b1d0562b66b1853b77d511feb786629  gnupg-1.9.15.tar.bz2
+221d843dc23b4f33cdb8a91788a00e4d  gnupg-1.9.18.tar.bz2


--- gnupg-1.9.15.tar.bz2.sig DELETED ---