drop disable tests patch and use new configure flag

diff --git a/gnupg2-disable_tests.patch b/gnupg2-disable_tests.patch
deleted file mode 100644 (file)
index 91f1fa9..0000000
--- a/gnupg2-disable_tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnupg-2.2.21/Makefile.am.orig      2020-07-11 11:23:42.113944299 +0200
-+++ gnupg-2.2.21/Makefile.am   2020-07-11 11:28:43.254496265 +0200
-@@ -103,7 +103,7 @@
- 
- SUBDIRS = m4 common kbx \
-           ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
--          tools po ${doc} tests
-+          tools po ${doc}
- 
- dist_doc_DATA = README
- 

diff --git a/gnupg2.spec b/gnupg2.spec
index f9709d9ac41d06d007ffbee99d1618d5a5f0247a..d253508a9838e75e2f7e9756e27d19baa72ede34 100644 (file)
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -18,8 +18,7 @@ Source0:      ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
 Source1:       gnupg-agent.sh
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-nogit.patch
-Patch2:                %{name}-disable_tests.patch
-Patch3:                %{name}-pl.po-update.patch
+Patch2:                %{name}-pl.po-update.patch
 URL:           http://www.gnupg.org/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.14
@@ -168,8 +167,7 @@ wywoływany przez gpgsm i nie używany bezpośrednio.
 %setup -q -n gnupg-%{version}
 %patch0 -p1
 %patch1 -p1
-%{!?with_tests:%patch2 -p1}
-%patch3 -p1
+%patch2 -p1
 
 %{__rm} po/stamp-po
 
@@ -193,6 +191,7 @@ fi
        %{?with_gnutls:--disable-ntbtls} \
        %{?with_selinux:--enable-selinux-support} \
        --enable-symcryptrun \
+       %{!?with_tests:--disable-tests} \
        --enable-wks-tools \
        --with-capabilities \
        --with-pinentry-pgm=%{_bindir}/pinentry \