- gnupg2-2.0.9

- drop Provides: openpgp
- versioned Provides: gpg
- own /etc/gnupg

.cvsignore

@@ -1,3 +1,2 @@
-clog
+gnupg-2.0.9.tar.bz2
-gnupg-2.0.8.tar.bz2
+gnupg-2.0.9.tar.bz2.sig
-gnupg-2.0.8.tar.bz2.sig

gnupg2.spec

@@ -1,8 +1,8 @@
 
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 2.0.8
+Version: 2.0.9
-Release: 3%{?dist}
+Release: 1%{?dist}
 
 License: GPLv3+
 Group:   Applications/System
@@ -28,6 +28,8 @@ BuildRequires: libusb-devel
 BuildRequires: openldap-devel
 %if 0%{?fedora} > 3 || 0%{?rhel} > 4
 BuildRequires: pcsc-lite-libs
+%else
+%define pcsclib libpcsclite.so.0
 %endif
 BuildRequires: pth-devel
 BuildRequires: readline-devel ncurses-devel
@@ -38,11 +40,8 @@ Requires(postun): /sbin/install-info
 Requires(hint): dirmngr
 Requires(hint): pinentry
 
-# ancient, deprecated
+# pgp-tools, perl-GnuPG-Interface requires 'gpg' (not sure why) -- Rex
-#Obsoletes: newpg < 0.9.5
+Provides: gpg = %{version}-%{release}
-
-Provides: gpg
-Provides: openpgp
 
 %description
 GnuPG is GNU's tool for secure communication and data storage.  It can
@@ -74,10 +73,8 @@ dependency on other modules at run and build time.
 # 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 0%{?fedora} > 3 || 0%{?rhel} > 4
+%if "%{?pcsclib}" == "%{nil}"
 %global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.? 2>/dev/null ) 2>/dev/null )
-%else
-%define pcsclib libpcsclite.so.0
 %endif
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c
@@ -97,18 +94,25 @@ make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot} \
+  INSTALL="install -p"
 
 %find_lang %{name}
 
-# file conflicts with gnupg-1.x 
+# gpgconf.conf
-rm -f $RPM_BUILD_ROOT%{_bindir}/{gpgsplit,gpg-zip} 
+mkdir -p %{buildroot}%{_sysconfdir}/gnupg
-rm -f $RPM_BUILD_ROOT%{_datadir}/gnupg/{FAQ,faq.html}
+touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf
 
-# Unpackaged files
+## Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+# file conflicts with gnupg-1.x
+# shouldn't gnupg2 be providing these now (maybe only f9+)? -- Rex
+rm -f %{buildroot}%{_bindir}/{gpgsplit,gpg-zip} 
+rm -f %{buildroot}%{_datadir}/gnupg/{FAQ,faq.html}
+
+# info dir
+rm -f %{buildroot}%{_infodir}/dir
 
 
 %check
@@ -130,6 +134,8 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+%dir %{_sysconfdir}/gnupg
+%ghost %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
 #docs say to install suid root, but we won't, for now.
 #attr(4755,root,root) %{_bindir}/gpg2
 %{_bindir}/gpg2
@@ -148,15 +154,21 @@ fi
 %{_sbindir}/*
 %{_datadir}/gnupg/
 %{_libexecdir}/*
-%{_infodir}/*
+%{_infodir}/*.info*
 %{_mandir}/man?/*
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %changelog
+* Wed Mar 26 2008 Rex Dieter <rdieter@fedoraproject.org> 2.0.9-1
+- gnupg2-2.0.9
+- drop Provides: openpgp
+- versioned Provides: gpg
+- own /etc/gnupg
+
 * Fri Feb 08 2008 Rex Dieter <rdieter@fedoraproject.org> 2.0.8-3 
 - respin (gcc43)
 

sources

@@ -1,2 +1,2 @@
-fc4377ca67e1bf687eeaf22e79c0b9d1  gnupg-2.0.8.tar.bz2
+b41f3f6716a74c46a609a71853e85c7b  gnupg-2.0.9.tar.bz2
-5f4fefbca2568910e3628b4d8ea3d485  gnupg-2.0.8.tar.bz2.sig
+29a90f2bdd27d79b7e9a0885f119832a  gnupg-2.0.9.tar.bz2.sig