From a8d3c07388790e4554817c8a541829a8962cf92e Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Thu, 26 Jul 2012 13:39:31 +0200 Subject: [PATCH] add compat symlinks and provides if built on RHEL --- gnupg-2.0.13-insttools.patch | 58 ++++++++++++++++++++++++++++++++++++ gnupg2.spec | 33 +++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 gnupg-2.0.13-insttools.patch diff --git a/gnupg-2.0.13-insttools.patch b/gnupg-2.0.13-insttools.patch new file mode 100644 index 0000000..415f320 --- /dev/null +++ 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 diff --git a/gnupg2.spec b/gnupg2.spec index 9e99590..976cbca 100644 --- a/gnupg2.spec +++ b/gnupg2.spec @@ -1,7 +1,7 @@ Summary: Utility for secure communication and data storage Name: gnupg2 Version: 2.0.19 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ Group: Applications/System @@ -9,6 +9,7 @@ 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-svn.tar.bz2 gnupg2 #Source0: gnupg2-20090809svn.tar.bz2 +Patch1: gnupg-2.0.13-insttools.patch Patch2: gnupg-2.0.16-tests-s2kcount.patch Patch3: gnupg-2.0.18-secmem.patch Patch4: gnupg-2.0.18-protect-tool-env.patch @@ -37,6 +38,14 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info Requires: pinentry +%if 0%{?rhel} > 5 +# pgp-tools, perl-GnuPG-Interface requires 'gpg' (not sure why) -- Rex +Provides: gpg = %{version}-%{release} +# Obsolete GnuPG-1 package +Provides: gnupg = %{version}-%{release} +Obsoletes: gnupg <= 1.4.10 +%endif + %package smime Summary: CMS encryption and signing tool and smart card support for GnuPG Requires: gnupg2 = %{version}-%{release} @@ -63,6 +72,9 @@ to the base GnuPG package %prep %setup -q -n gnupg-%{version} +%if 0%{?rhel} > 5 +%patch1 -p1 -b .insttools +%endif %patch2 -p1 -b .s2k %patch3 -p1 -b .secmem %patch4 -p1 -b .ptool-env @@ -95,8 +107,10 @@ make install DESTDIR=%{buildroot} \ INSTALL="install -p" \ docdir=%{_docdir}/%{name}-%{version} +%if ! 0%{?rhel} > 5 # drop file conflicting with gnupg-1.x rm -f %{buildroot}%{_mandir}/man1/gpg-zip.1* +%endif %find_lang %{name} @@ -108,6 +122,14 @@ touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf install -m644 -p AUTHORS COPYING ChangeLog NEWS THANKS TODO \ %{buildroot}%{_docdir}/%{name}-%{version}/ +%if 0%{?rhel} > 5 +# 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 +%endif + # info dir rm -f %{buildroot}%{_infodir}/dir @@ -143,6 +165,12 @@ fi %{_bindir}/gpgconf %{_bindir}/gpgkey2ssh %{_bindir}/gpgparsemail +%if 0%{?rhel} > 5 +%{_bindir}/gpg +%{_bindir}/gpgv +%{_bindir}/gpgsplit +%{_bindir}/gpg-zip +%endif %{_bindir}/watchgnupg %{_sbindir}/* %{_datadir}/gnupg/ @@ -168,6 +196,9 @@ rm -rf %{buildroot} %changelog +* Thu Jul 25 2012 Tomas Mraz - 2.0.19-3 +- add compat symlinks and provides if built on RHEL + * Thu Jul 19 2012 Fedora Release Engineering - 2.0.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild