- let tests bcond disable all tests; enable tests by default

diff --git a/gpgme-kill-tests.patch b/gpgme-kill-tests.patch
index fe29abf701495116b550d3000368f54d0ca1689e..8c8a1fe784ed84a1bac2b5f4cf1e6c74ea10e8b8 100644 (file)
--- a/gpgme-kill-tests.patch
+++ b/gpgme-kill-tests.patch
@@ -1,24 +1,16 @@
---- gpgme-1.3.2/Makefile.am.orig       2012-05-02 11:06:48.000000000 +0200
-+++ gpgme-1.3.2/Makefile.am    2012-05-22 15:54:54.703338663 +0200
-@@ -28,11 +28,7 @@
-              ChangeLog-2011 m4/ChangeLog-2011 contrib/ChangeLog-2011
- 
- 
--if RUN_GPG_TESTS
--tests = tests
--else
- tests =
--endif
- 
- SUBDIRS = src ${tests} doc lang
- 
---- gpgme-1.11.1/lang/python/Makefile.am~      2018-05-24 15:35:00.000000000 +0200
-+++ gpgme-1.11.1/lang/python/Makefile.am       2018-05-24 15:35:43.288306076 +0200
-@@ -24,7 +24,7 @@ EXTRA_DIST = \
-       examples \
+--- gpgme-1.12.0/lang/python/Makefile.am.orig  2018-10-05 15:17:05.000000000 +0200
++++ gpgme-1.12.0/lang/python/Makefile.am       2018-10-18 21:49:34.447090074 +0200
+@@ -25,7 +25,13 @@
+       doc \
        src
  
 -SUBDIRS = . tests
++if RUN_GPG_TESTS
++tests = tests
++else
++tests =
++endif
++
 +SUBDIRS = . ${tests}
  
  .PHONY: prepare

diff --git a/gpgme.spec b/gpgme.spec
index 91e9df13f27bcb4ad62a0506d7ad7c0eddb8c01d..53885ca988ca7a7ce84491a0befb8ab946308d43 100644 (file)
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -7,7 +7,7 @@
 %bcond_without python          # Python interfaces (PyME, both python2+python3)
 %bcond_without python2         # Python 2 interface (PyME)
 %bcond_without python3         # Python 3 interface (PyME)
-%bcond_with    tests           # perform tests
+%bcond_without tests           # perform tests
 #
 %if %{without python}
 %undefine      with_python2
@@ -225,7 +225,7 @@ PyME to interfejs Pythona do biblioteki GPGME.
 %prep
 %setup -q
 %patch0 -p1
-%{!?with_tests:%patch1 -p1}
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
@@ -239,6 +239,12 @@ PyME to interfejs Pythona do biblioteki GPGME.
 # "python" means both pythons (if available), "python2" just python2, "python3" just python3
 # (cannot specify "python2 python3" due to script limitations)
 %configure \
+%if %{without tests}
+       --disable-g13-test \
+       --disable-gpg-test \
+       --disable-gpgconf-test \
+       --disable-gpgsm-test \
+%endif
        --enable-languages="%{?with_commonlisp:cl} %{?with_cxx:cpp} %{?with_python2:python%{!?with_python3:2}} %{?with_python3:%{!?with_python2:python3}} %{?with_qt5:qt}" \
        %{?with_static_libs:--enable-static}