From 2d4b7e86d54b1909058bf5917805fba3ed48c81a Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 17 Aug 2010 14:23:21 +0200 Subject: [PATCH] - drop the provides/obsoletes for gnupg - drop the man page file conflicting with gnupg-1.x --- gnupg2.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnupg2.spec b/gnupg2.spec index 55fdfe4..ca07905 100644 --- a/gnupg2.spec +++ b/gnupg2.spec @@ -2,7 +2,7 @@ Summary: Utility for secure communication and data storage Name: gnupg2 Version: 2.0.16 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ Group: Applications/System @@ -41,12 +41,6 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info Requires(hint): pinentry -# 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 - %package smime Summary: CMS encryption and signing tool and smart card support for GnuPG Requires: gnupg2 = %{version}-%{release} @@ -105,6 +99,9 @@ make install DESTDIR=%{buildroot} \ INSTALL="install -p" \ docdir=%{_docdir}/%{name}-%{version} +# drop file conflicting with gnupg-1.x +rm -f %{buildroot}%{_mandir}/man1/gpg-zip.1* + %find_lang %{name} # gpgconf.conf @@ -175,6 +172,10 @@ rm -rf %{buildroot} %changelog +* Tue Aug 17 2010 Tomas Mraz - 2.0.16-3 +- drop the provides/obsoletes for gnupg +- drop the man page file conflicting with gnupg-1.x + * Fri Aug 13 2010 Tomas Mraz - 2.0.16-2 - drop the compat symlinks as gnupg-1.x is revived