Accepting request 888302 from home:AndreasStieger:branches:Base:System

Let's leave Factory at 2.2.x, and put 2.3.x into security:privacy until it becomes stable at 2.4.x. See SR#888300

OBS-URL: https://build.opensuse.org/request/show/888302
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=264

gpg2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           gpg2
-Version:        2.3.0
+Version:        2.2.27
 Release:        0
 Summary:        File encryption, decryption, signature creation and verification utility
 License:        GPL-3.0-or-later
@@ -30,6 +30,7 @@ Source3:        %{name}.keyring
 Source4:        scdaemon.udev
 Source99:       %{name}.changes
 Patch4:         gnupg-2.0.9-langinfo.patch
+Patch5:         gnupg-2.2.8-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
@@ -41,12 +42,10 @@ Patch15:        gnupg-allow-import-of-previously-known-keys-even-without-UIDs.pa
 Patch1124847:   gnupg-gpg-agent-ulimit.patch
 BuildRequires:  expect
 BuildRequires:  fdupes
-BuildRequires:  ibmswtpm2
-BuildRequires:  ibmtss-devel
 BuildRequires:  libassuan-devel >= 2.5.0
-BuildRequires:  libgcrypt-devel >= 1.9.1
-BuildRequires:  libgpg-error-devel >= 1.41
-BuildRequires:  libksba-devel >= 1.3.4
+BuildRequires:  libgcrypt-devel >= 1.8.0
+BuildRequires:  libgpg-error-devel >= 1.27
+BuildRequires:  libksba-devel >= 1.3.5
 BuildRequires:  makeinfo
 BuildRequires:  npth-devel >= 1.2
 BuildRequires:  openldap2-devel
@@ -55,17 +54,19 @@ BuildRequires:  readline-devel
 BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(gnutls) >= 3.0
 BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  pkgconfig(sqlite3) >= 3.27
+BuildRequires:  pkgconfig(sqlite3) >= 3.7
 BuildRequires:  pkgconfig(zlib)
 # runtime dependency to support devel repository users - boo#955982
 Requires:       libassuan0 >= 2.5.0
-Requires:       libgcrypt20 >= 1.9.1
-Requires:       libksba >= 1.3.4
+Requires:       libgcrypt20 >= 1.8.0
+Requires:       libksba >= 1.3.5
 Requires:       pinentry
 Recommends:     dirmngr = %{version}
 Provides:       gnupg = %{version}
 Provides:       gpg = 1.4.9
 Provides:       newpg
+# special feature needed for OBS signd
+Provides:       gpg2_signd_support
 Obsoletes:      gpg < 1.4.9
 
 %description
@@ -93,6 +94,7 @@ gpgsm, or via the gpg-connect-agent tool.
 %setup -q -n gnupg-%{version}
 %patch1124847 -p1
 %patch4 -p1
+%patch5 -p1
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
@@ -114,6 +116,7 @@ date=$(date -u +%%Y-%%m-%%dT%%H:%%M+0000 -r %{SOURCE99})
     --with-scdaemon-pgm=%{_bindir}/scdaemon \
     --enable-ldap \
     --enable-gpgsm=yes \
+    --enable-gpg \
     --enable-gpgtar \
     --enable-g13 \
     --enable-large-secmem \
@@ -122,6 +125,7 @@ date=$(date -u +%%Y-%%m-%%dT%%H:%%M+0000 -r %{SOURCE99})
     --with-default-trust-store-file=%{_sysconfdir}/ssl/ca-bundle.pem \
     --enable-build-timestamp=$date \
     --enable-gpg-is-gpg2 \
+    --enable-Werror
 
 %make_build
 
@@ -145,6 +149,9 @@ mv %{buildroot}%{_libdir}/scdaemon %{buildroot}%{_bindir}
 mv %{buildroot}%{_libdir}/dirmngr_ldap %{buildroot}%{_bindir}
 # install udev rules for scdaemon
 install -Dm 0644 %{SOURCE4} %{buildroot}%{_udevrulesdir}/60-scdaemon.rules
+# install legacy tools
+install -m 755 tools/gpg-zip %{buildroot}/%{_bindir}
+# install -m 755 tools/gpgsplit %%{buildroot}/%%{_bindir}
 
 %find_lang gnupg2
 %fdupes -s %{buildroot}