[packages/gnupg2] drop disable tests patch and use new configure flag

atler atler at pld-linux.org
Sat Aug 29 22:43:43 CEST 2020


commit a772cce7510e6cc5a2cabd8d56794140ea75fee0
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Aug 29 14:45:48 2020 +0200

    drop disable tests patch and use new configure flag

 gnupg2-disable_tests.patch | 11 -----------
 gnupg2.spec                |  7 +++----
 2 files changed, 3 insertions(+), 15 deletions(-)
---
diff --git a/gnupg2.spec b/gnupg2.spec
index f9709d9..d253508 100644
--- 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 \
diff --git a/gnupg2-disable_tests.patch b/gnupg2-disable_tests.patch
deleted file mode 100644
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
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnupg2.git/commitdiff/a772cce7510e6cc5a2cabd8d56794140ea75fee0



More information about the pld-cvs-commit mailing list