- provide/obsolete gnupg-1 and add compat symlinks to be able to drop

gnupg-1
2009-10-21 12:28:38 +00:00 · 2009-10-21 12:28:38 +00:00 · bf7a511f28
commit bf7a511f28
parent d779861d23
2 changed files with 80 additions and 8 deletions
--- a/gnupg-2.0.13-insttools.patch
+++ b/gnupg-2.0.13-insttools.patch
@ -0,0 +1,58 @@
+diff -up gnupg-2.0.13/tools/Makefile.am.insttools gnupg-2.0.13/tools/Makefile.am
+--- gnupg-2.0.13/tools/Makefile.am.insttools	2009-04-17 19:39:47.000000000 +0200
+++ gnupg-2.0.13/tools/Makefile.am	2009-10-21 14:13:42.000000000 +0200
+@@ -32,8 +32,8 @@ sbin_SCRIPTS = addgnupghome applygnupgde
+ 
+ bin_SCRIPTS = gpgsm-gencert.sh
+ if HAVE_USTAR
+-# bin_SCRIPTS += gpg-zip
+-noinst_SCRIPTS = gpg-zip
+bin_SCRIPTS += gpg-zip
+#noinst_SCRIPTS = gpg-zip
+ endif
+ 
+ if BUILD_SYMCRYPTRUN
+@@ -42,7 +42,7 @@ else
+   symcryptrun =
+ endif
+ 
+-bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun}
+bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} gpgsplit
+ if !HAVE_W32_SYSTEM
+ bin_PROGRAMS += watchgnupg gpgparsemail
+ endif
+@@ -51,7 +51,7 @@ if !DISABLE_REGEX
+ libexec_PROGRAMS = gpg-check-pattern
+ endif
+ 
+-noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
+noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert
+ 
+ common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a
+ pwquery_libs = ../common/libsimple-pwquery.a
+diff -up gnupg-2.0.13/tools/Makefile.in.insttools gnupg-2.0.13/tools/Makefile.in
+--- gnupg-2.0.13/tools/Makefile.in.insttools	2009-09-04 18:09:12.000000000 +0200
+++ gnupg-2.0.13/tools/Makefile.in	2009-10-21 14:15:17.000000000 +0200
+@@ -87,11 +87,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(sr
+ @GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
+ @GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
+ bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \
+-	gpgkey2ssh$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
+	gpgkey2ssh$(EXEEXT) gpgsplit$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
+ @HAVE_W32_SYSTEM_FALSE@am__append_7 = watchgnupg gpgparsemail
+ @DISABLE_REGEX_FALSE@libexec_PROGRAMS = gpg-check-pattern$(EXEEXT)
+ noinst_PROGRAMS = clean-sat$(EXEEXT) mk-tdata$(EXEEXT) \
+-	make-dns-cert$(EXEEXT) gpgsplit$(EXEEXT)
+	make-dns-cert$(EXEEXT)
+ subdir = tools
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/gl/m4/absolute-header.m4 \
+@@ -425,7 +425,7 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER
+ sbin_SCRIPTS = addgnupghome applygnupgdefaults
+ bin_SCRIPTS = gpgsm-gencert.sh
+ # bin_SCRIPTS += gpg-zip
+-@HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
+@HAVE_USTAR_TRUE@bin_SCRIPTS += gpg-zip
+ @BUILD_SYMCRYPTRUN_FALSE@symcryptrun = 
+ @BUILD_SYMCRYPTRUN_TRUE@symcryptrun = symcryptrun
+ common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a
--- a/gnupg2.spec
+++ b/gnupg2.spec
@ -2,7 +2,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.13
-Release: 1%{?dist}
+Release: 2%{?dist}

 License: GPLv3+
 Group:   Applications/System
@ -10,6 +10,8 @@ Source0: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.
 Source1: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.tar.bz2.sig
 # svn export svn://cvs.gnupg.org/gnupg/trunk gnupg2; tar cjf gnupg-<date>svn.tar.bz2 gnupg2
 #Source0: gnupg2-20090809svn.tar.bz2
+Patch1:  gnupg-2.0.13-insttools.patch
+
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

@ -45,6 +47,9 @@ Requires(hint): pinentry

 # pgp-tools, perl-GnuPG-Interface requires 'gpg' (not sure why) -- Rex
 Provides: gpg = %{version}-%{release}
+# Obsolete GnuPG-1 package
+Provides: gnupg = 1.4.10
+Obsoletes: gnupg <= 1.4.10

 %description
 GnuPG is GNU's tool for secure communication and data storage.  It can
@ -71,6 +76,8 @@ dependency on other modules at run and build time.
 %prep
 %setup -q -n gnupg-%{version}

+%patch1 -p1 -b .insttools
+
 # 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).
@ -115,11 +122,12 @@ touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf
 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 f11+)? -- Rex
-rm -f %{buildroot}%{_bindir}/{gpgsplit,gpg-zip} 
-rm -f %{buildroot}%{_mandir}/man1/gpg-zip.1*
+# compat symlinks
+ln -sf gpg2 %{buildroot}%{_bindir}/gpg
+ln -sf gpgv2 %{buildroot}%{_bindir}/gpgv
+ln -sf gpg2.1 %{buildroot}%{_mandir}/man1/gpg.1
+ln -sf gpgv2.1 %{buildroot}%{_mandir}/man1/gpgv.1
+

 # info dir
 rm -f %{buildroot}%{_infodir}/dir
@ -151,14 +159,16 @@ fi
 #attr(4755,root,root) %{_bindir}/gpg2
 %{_bindir}/gpg2
 %{_bindir}/gpgv2
+%{_bindir}/gpg
+%{_bindir}/gpgv
 %{_bindir}/gpg-connect-agent
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
 %{_bindir}/gpgkey2ssh
 %{_bindir}/gpgparsemail
 %{_bindir}/gpgsm*
-#{_bindir}/gpgsplit
-#{_bindir}/gpg-zip
+%{_bindir}/gpgsplit
+%{_bindir}/gpg-zip
 %{_bindir}/kbxutil
 %{_bindir}/scdaemon
 %{_bindir}/watchgnupg
@ -174,6 +184,10 @@ rm -rf %{buildroot}


 %changelog
+* Wed Oct 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.0.13-2
+- provide/obsolete gnupg-1 and add compat symlinks to be able to drop
+  gnupg-1
+
 * Fri Sep 04 2009 Rex Dieter <rdieter@fedoraproject.org> - 2.0.13-1
 - gnupg-2.0.13
 - Unable to use gpg-agent + input methods (#228953)