rpms/gnupg2/F-9 .cvsignore, 1.27, 1.28 gnupg2.spec, 1.86, 1.87 sources, 1.29, 1.30 gnupg-1.9.16-testverbose.patch, 1.1, NONE gnupg2-2.0.9-gcc43.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/gnupg2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12695

Modified Files:
	.cvsignore gnupg2.spec sources 
Removed Files:
	gnupg-1.9.16-testverbose.patch gnupg2-2.0.9-gcc43.patch 
Log Message:
* Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.10-1
- gnupg-2.0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-9/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	26 Mar 2008 17:15:26 -0000	1.27
+++ .cvsignore	16 Jan 2009 18:10:36 -0000	1.28
@@ -1,2 +1,2 @@
-gnupg-2.0.9.tar.bz2
-gnupg-2.0.9.tar.bz2.sig
+gnupg-2.0.10.tar.bz2
+gnupg-2.0.10.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-9/gnupg2.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- gnupg2.spec	24 May 2008 18:18:54 -0000	1.86
+++ gnupg2.spec	16 Jan 2009 18:10:36 -0000	1.87
@@ -1,8 +1,8 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.9
-Release: 2%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
 
 License: GPLv3+
 Group:   Applications/System
@@ -11,21 +11,15 @@
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: gnupg-1.9.16-testverbose.patch
-
-# Patch from upstream to fix curl 7.18.1+ and gcc4.3+ compile error
-# http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html
-Patch2: gnupg2-2.0.9-gcc43.patch
-
 BuildRequires: bzip2-devel
 BuildRequires: curl-devel
 BuildRequires: docbook-utils
 BuildRequires: gettext
 BuildRequires: libassuan-devel >= 1.0.4
 # libgcrypt-devel >= 1.4.0 is preferred, see http://bugzilla.redhat.com/435320
-#BuildRequires:  libgcrypt-devel >= 1.4.0
-#Requires(hint): libgcrypt >= 1.4.0
-BuildRequires: libgcrypt-devel => 1.2.2
+BuildRequires:  libgcrypt-devel >= 1.4
+#Requires(hint): libgcrypt >= 1.4
+#BuildRequires: libgcrypt-devel => 1.2.2
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.2
 BuildRequires: libusb-devel
@@ -72,13 +66,10 @@
 %prep
 %setup -q -n gnupg-%{version}%{?pre}
 
-#patch1 -p1 -b .testverbose
-%patch2 -p1 -b .gcc43
-
 # 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 "%{?pcsclib}" == "%{nil}"
+%if "x%{?pcsclib}" == "x%{nil}"
 %global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.? 2>/dev/null ) 2>/dev/null )
 %endif
 
@@ -102,7 +93,8 @@
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} \
-  INSTALL="install -p"
+  INSTALL="install -p" \
+  docdir=%{_docdir}/%{name}-%{version}
 
 %find_lang %{name}
 
@@ -110,11 +102,15 @@
 mkdir -p %{buildroot}%{_sysconfdir}/gnupg
 touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf
 
+# more docs
+install -m644 -p AUTHORS COPYING ChangeLog NEWS THANKS TODO \
+  %{buildroot}%{_docdir}/%{name}-%{version}/
+
 ## Unpackaged files
 # file conflicts with gnupg-1.x
-# shouldn't gnupg2 be providing these now (maybe only f9+)? -- Rex
+# shouldn't gnupg2 be providing these now (maybe only f11+)? -- Rex
 rm -f %{buildroot}%{_bindir}/{gpgsplit,gpg-zip} 
-rm -f %{buildroot}%{_datadir}/gnupg/{FAQ,faq.html}
+rm -f %{buildroot}%{_mandir}/man1/gpg-zip.1*
 
 # info dir
 rm -f %{buildroot}%{_infodir}/dir
@@ -138,7 +134,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+#doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+%{_docdir}/%{name}-%{version}/
 %dir %{_sysconfdir}/gnupg
 %ghost %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
 #docs say to install suid root, but we won't, for now.
@@ -168,6 +165,12 @@
 
 
 %changelog
+* Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 2.0.10-1
+- gnupg-2.0.10
+
+* Mon Aug 04 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0.9-3
+- workaround rpm quirks 
+
 * Sat May 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.9-2
 - Patch from upstream to fix curl 7.18.1+ and gcc4.3+ compile error
 
@@ -178,7 +181,7 @@
 - gnupg2-2.0.9
 - drop Provides: openpgp
 - versioned Provides: gpg
-- own /etc/gnupg
+- own %%_sysconfdir/gnupg
 
 * Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0.8-3 
 - respin (gcc43)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-9/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	26 Mar 2008 17:15:26 -0000	1.29
+++ sources	16 Jan 2009 18:10:36 -0000	1.30
@@ -1,2 +1,2 @@
-b41f3f6716a74c46a609a71853e85c7b  gnupg-2.0.9.tar.bz2
-29a90f2bdd27d79b7e9a0885f119832a  gnupg-2.0.9.tar.bz2.sig
+1cb778dd555f87685a8fde2f7113725e  gnupg-2.0.10.tar.bz2
+bf002a27b578b229adae914769272b27  gnupg-2.0.10.tar.bz2.sig


--- gnupg-1.9.16-testverbose.patch DELETED ---


--- gnupg2-2.0.9-gcc43.patch DELETED ---