From c62acc05d8446504046bdd2c24409fc0bf72d136 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Wed, 5 Oct 2022 23:17:04 -0400
Subject: [PATCH] drop with/without unversioned_gpg, last used with fedora-29

It's been nearly 3 years since Fedora 29 reached end-of-life
(2019-11-26).  Clean up the unversioned_gpg conditional.
---
 gnupg2.spec | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/gnupg2.spec b/gnupg2.spec
index 406aaca..6a413af 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -1,9 +1,3 @@
-%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.3.7
@@ -67,13 +61,11 @@ Recommends: gnupg2-smime
 # for USB smart card support
 Recommends: pcsc-lite-ccid
 
-%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.24
-%endif
 
 Provides: dirmngr = %{version}-%{release}
 Obsoletes: dirmngr < 1.2.0-1
@@ -129,9 +121,6 @@ sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/scdaemon.c
 # can not regenerate makefiles because of automake-1.16.3 requirement
 # ./autogen.sh
 %configure \
-%if %{without unversioned_gpg}
-  --enable-gpg-is-gpg2 \
-%endif
   --disable-rpath \
   --enable-g13 \
   --disable-ccid-driver \
@@ -147,11 +136,6 @@ mkdir -p $HOME/.gnupg
 %make_install \
   docdir=%{_pkgdocdir}
 
-%if %{without unversioned_gpg}
-# rename file conflicting with gnupg-1.x
-rename gnupg.7 gnupg2.7 %{buildroot}%{_mandir}/man7/gnupg.7*
-%endif
-
 %find_lang %{name}
 
 # gpgconf.conf
@@ -162,14 +146,12 @@ touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf
 install -m644 -p AUTHORS NEWS THANKS TODO \
   %{buildroot}%{_pkgdocdir}
 
-%if %{with unversioned_gpg}
 # compat symlinks
 ln -sf gpg %{buildroot}%{_bindir}/gpg2
 ln -sf gpgv %{buildroot}%{_bindir}/gpgv2
 ln -sf gpg.1 %{buildroot}%{_mandir}/man1/gpg2.1
 ln -sf gpgv.1 %{buildroot}%{_mandir}/man1/gpgv2.1
 ln -sf gnupg.7 %{buildroot}%{_mandir}/man7/gnupg2.7
-%endif
 
 # info dir
 rm -f %{buildroot}%{_infodir}/dir
@@ -207,11 +189,9 @@ make -k check
 %{_bindir}/g13
 %{_bindir}/dirmngr
 %{_bindir}/dirmngr-client
-%if %{with unversioned_gpg}
 %{_bindir}/gpg
 %{_bindir}/gpgv
 %{_bindir}/gpgsplit
-%endif
 %{_bindir}/watchgnupg
 %{_bindir}/gpg-wks-server
 %{_sbindir}/*
@@ -231,6 +211,7 @@ make -k check
 %changelog
 * Wed Oct 05 2022 Todd Zullinger <tmz@pobox.com> - 2.3.7-4
 - update BR/R versions for libassuan, libgpg-error, and libksba
+- drop with/without unversioned_gpg, last used with fedora-29
 
 * Mon Aug 01 2022 Jakub Jelen <jjelen@redhat.com> - 2.3.7-3
 - Fix yubikey 5 detection (#2107766)