diff --git a/gnupg2.spec b/gnupg2.spec index 100ce29..ebc89aa 100644 --- a/gnupg2.spec +++ b/gnupg2.spec @@ -1,7 +1,13 @@ +%if 0%{?fedora} && 0%{?fedora} < 30 +%bcond_with unversioned_gpg +%else +%bcond_without unversioned_gpg +%endif + Summary: Utility for secure communication and data storage Name: gnupg2 Version: 2.2.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: Applications/System @@ -46,12 +52,12 @@ Recommends: pinentry Recommends: gnupg2-smime -%if 0%{?rhel} > 5 +%if %{with unversioned_gpg} # 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 +Obsoletes: gnupg < 1.4.24 %endif Provides: dirmngr = %{version}-%{release} @@ -85,7 +91,7 @@ to the base GnuPG package %prep %setup -q -n gnupg-%{version} -%if 0%{?rhel} > 5 +%if %{with unversioned_gpg} %patch1 -p1 -b .insttools %endif %patch3 -p1 -b .secmem @@ -105,7 +111,7 @@ sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/scdaemon.c %build %configure \ -%if ! (0%{?rhel} > 5) +%if %{without unversioned_gpg} --enable-gpg-is-gpg2 \ %endif --disable-gpgtar \ @@ -139,7 +145,7 @@ touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf install -m644 -p AUTHORS NEWS THANKS TODO \ %{buildroot}%{_pkgdocdir} -%if 0%{?rhel} > 5 +%if %{with unversioned_gpg} # compat symlinks ln -sf gpg %{buildroot}%{_bindir}/gpg2 ln -sf gpgv %{buildroot}%{_bindir}/gpgv2 @@ -177,7 +183,7 @@ make -k check %{_bindir}/g13 %{_bindir}/dirmngr %{_bindir}/dirmngr-client -%if 0%{?rhel} > 5 +%if %{with unversioned_gpg} %{_bindir}/gpg %{_bindir}/gpgv %{_bindir}/gpgsplit @@ -199,6 +205,9 @@ make -k check %changelog +* Sat Dec 08 2018 Igor Gnatenko - 2.2.11-2 +- Provide unversioned GPG on F30+ + * Fri Nov 30 2018 Tomáš Mráz - 2.2.11-1 - upgrade to 2.2.11