[packages/gnupg2] fix build without tests
atler
atler at pld-linux.org
Sat Jul 11 12:47:30 CEST 2020
commit bcca612a04f37a1b97cd7772b25b0b4c953097b1
Author: Jan Palus <atler at pld-linux.org>
Date: Sat Jul 11 12:45:21 2020 +0200
fix build without tests
gnupg2-disable_tests.patch | 20 ++++++++++----------
gnupg2.spec | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/gnupg2.spec b/gnupg2.spec
index 952771a..7af5e16 100644
--- 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
diff --git a/gnupg2-disable_tests.patch b/gnupg2-disable_tests.patch
index 7a3499e..91f1fa9 100644
--- 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} \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnupg2.git/commitdiff/bcca612a04f37a1b97cd7772b25b0b4c953097b1
More information about the pld-cvs-commit
mailing list