fix build without tests

diff --git a/gnupg2-disable_tests.patch b/gnupg2-disable_tests.patch
index 7a3499ec5426c5081f865bfdb35bc76bb0f8f602..91f1fa967e3ca4cd4a8a56e925872a7e240e7dbc 100644 (file)
--- a/gnupg2-disable_tests.patch
+++ b/gnupg2-disable_tests.patch
@@ -1,11 +1,11 @@
---- gnupg-1.9.91/Makefile.am.orig      2006-09-27 17:32:53.000000000 +0200
-+++ gnupg-1.9.91/Makefile.am   2006-10-07 18:09:36.428269750 +0200
-@@ -70,7 +70,7 @@
- if HAVE_W32_SYSTEM
- tests =
- else
--tests = tests
-+tests =
- endif
+--- 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
  
- SUBDIRS = m4 intl gl include jnlib common ${kbx} \

diff --git a/gnupg2.spec b/gnupg2.spec
index 952771ad934b416f01d8b67153f6d416a16b3046..7af5e166209a7e1bfa9a40f8dc278ff99eb6fbf4 100644 (file)
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -265,7 +265,7 @@ EOF
 %attr(755,root,root) %{_bindir}/gpg-connect-agent
 %attr(755,root,root) %{_bindir}/gpgconf
 %attr(755,root,root) %{_bindir}/gpgparsemail
-%attr(755,root,root) %{_bindir}/gpgscm
+%{?with_tests:%attr(755,root,root) %{_bindir}/gpgscm}
 %attr(755,root,root) %{_bindir}/gpgtar
 %attr(755,root,root) %{_bindir}/kbxutil
 %attr(755,root,root) %{_bindir}/watchgnupg