Accepting request 291614 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/291614
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=87

gpg2.spec

@@ -27,17 +27,13 @@ Source:         ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
 Source2:        ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
 # https://www.gnupg.org/signature_key.html
 Source3:        %{name}.keyring
-Patch2:         gnupg-2.0.4-install_tools.diff
 Patch4:         gnupg-2.0.9-langinfo.patch
 Patch5:         gnupg-2.0.18-files-are-digests.patch
 Patch6:         gnupg-dont-fail-with-seahorse-agent.patch
 Patch8:         gnupg-set_umask_before_open_outfile.patch
 Patch9:         gnupg-detect_FIPS_mode.patch
 Patch11:        gnupg-add_legacy_FIPS_mode_option.patch
-Patch12:        gnupg-remove_development_version_warning.patch
-Patch14:        gnupg-large_keys.patch
 Patch15:        0001-gpg-Skip-legacy-keys-while-searching-keyrings.patch
-BuildRequires:  automake >= 1.14
 BuildRequires:  expect
 BuildRequires:  fdupes
 BuildRequires:  gnutls-devel >= 3.0
@@ -79,19 +75,15 @@ gpg-agent, and a keybox library.
 
 %prep
 %setup -q -n gnupg-%{version}
-%patch2
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
 %patch11 -p1
-%patch12 -p1
-%patch14 -p1
 %patch15 -p1
 
 %build
-autoreconf -fi
 # build PIEs (position independent executables) for address space randomisation:
 %ifarch s390x %{sparc}
 # s390x needs to use the large PIE model (at least for gpg.c):
@@ -138,6 +130,10 @@ install -m 644 AUTHORS COPYING ChangeLog NEWS THANKS TODO doc/FAQ %{buildroot}/%
 # install scdaemon to %{_bindir} (bnc#863645)
 mv %{buildroot}%{_libdir}/scdaemon %{buildroot}%{_bindir}
 mv %{buildroot}%{_libdir}/dirmngr_ldap %{buildroot}%{_bindir}
+# install legacy tools
+install -m 755 tools/gpg-zip %{buildroot}/%{_bindir}
+install -m 755 tools/gpgsplit %{buildroot}/%{_bindir}
+
 %find_lang gnupg2
 %if 0%{?suse_version} > 1020
 %fdupes %{buildroot}