- python build/test fixes, rel 3

diff --git a/0001-fix-stupid-ax_python_devel.patch b/0001-fix-stupid-ax_python_devel.patch
new file mode 100644 (file)
index 0000000..46ad827
--- /dev/null
+++ b/0001-fix-stupid-ax_python_devel.patch
@@ -0,0 +1,100 @@
+From b0eabea4b1232ee7f45d13b8add928d463f37444 Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
+Date: Wed, 29 Mar 2017 07:13:35 +0200
+Subject: [PATCH] fix stupid ax_python_devel
+
+References: https://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=commit;h=883a2abd5af5c96be894d5ef7ee6e9a2b8e64307
+Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
+---
+ m4/ax_python_devel.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
+index b990d5b3..318b089c 100644
+--- a/m4/ax_python_devel.m4
++++ b/m4/ax_python_devel.m4
+@@ -137,7 +137,7 @@ variable to configure. See ``configure --help'' for reference.
+       #
+       AC_MSG_CHECKING([for the distutils Python package])
+       ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-      if test -z "$ac_distutils_result"; then
++      if test $? -eq 0; then
+               AC_MSG_RESULT([yes])
+       else
+               AC_MSG_RESULT([no])
+diff --git a/configure b/configure
+index 6200f91..6a3d6f1 100755
+--- a/configure
++++ b/configure
+@@ -19880,7 +19868,7 @@ variable to configure. See \`\`configure --help'' for reference.
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+       ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-      if test -z "$ac_distutils_result"; then
++      if test $? -eq 0; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+       else
+@@ -20510,7 +20498,7 @@ variable to configure. See \`\`configure --help'' for reference.
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+       ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-      if test -z "$ac_distutils_result"; then
++      if test $? -eq 0; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+       else
+@@ -21140,7 +21128,7 @@ variable to configure. See \`\`configure --help'' for reference.
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+       ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-      if test -z "$ac_distutils_result"; then
++      if test $? -eq 0; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+       else
+@@ -21770,7 +21758,7 @@ variable to configure. See \`\`configure --help'' for reference.
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+       ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-      if test -z "$ac_distutils_result"; then
++      if test $? -eq 0; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+       else
+@@ -22400,7 +22388,7 @@ variable to configure. See \`\`configure --help'' for reference.
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+       ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-      if test -z "$ac_distutils_result"; then
++      if test $? -eq 0; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+       else
+@@ -23030,7 +23018,7 @@ variable to configure. See \`\`configure --help'' for reference.
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+       ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-      if test -z "$ac_distutils_result"; then
++      if test $? -eq 0; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+       else
+@@ -23660,7 +23648,7 @@ variable to configure. See \`\`configure --help'' for reference.
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+       ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-      if test -z "$ac_distutils_result"; then
++      if test $? -eq 0; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+       else
+@@ -24290,7 +24278,7 @@ variable to configure. See \`\`configure --help'' for reference.
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
+ $as_echo_n "checking for the distutils Python package... " >&6; }
+       ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+-      if test -z "$ac_distutils_result"; then
++      if test $? -eq 0; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+       else

diff --git a/gpgme.spec b/gpgme.spec
index 94b487faef50fbae1d9fe41fd897bf15ab255262..e5be9fdfdd44ea36f6fd4b0e25825ec7456709b3 100644 (file)
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -20,7 +20,7 @@ Summary:      Library for accessing GnuPG
 Summary(pl.UTF-8):     Biblioteka dająca dostęp do funkcji GnuPG
 Name:          gpgme
 Version:       1.17.1
-Release:       2
+Release:       3
 Epoch:         1
 License:       LGPL v2.1+
 Group:         Libraries
@@ -30,11 +30,16 @@ Patch0:             %{name}-info.patch
 Patch1:                %{name}-kill-tests.patch
 Patch2:                %{name}-largefile.patch
 Patch3:                %{name}-python.patch
+Patch4:                python3.10.patch
+Patch5:                0001-fix-stupid-ax_python_devel.patch
 URL:           http://www.gnupg.org/gpgme.html
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.14
-%{?with_tests:BuildRequires:   gnupg-agent}
-%{?with_tests:BuildRequires:   gnupg-smime}
+%if %{with tests}
+BuildRequires: gnupg2
+BuildRequires: gnupg-agent
+BuildRequires: gnupg-smime
+%endif
 BuildRequires: libassuan-devel >= 1:2.4.2
 BuildRequires: libgpg-error-devel >= 1.36
 %{?with_cxx:BuildRequires:     libstdc++-devel >= 6:4.7}
@@ -228,6 +233,8 @@ PyME to interfejs Pythona do biblioteki GPGME.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}

diff --git a/python3.10.patch b/python3.10.patch
new file mode 100644 (file)
index 0000000..a2e8589
--- /dev/null
+++ b/python3.10.patch
@@ -0,0 +1,22 @@
+--- gpgme-1.17.1/configure.ac~ 2022-04-01 12:46:31.000000000 +0200
++++ gpgme-1.17.1/configure.ac  2022-04-01 12:59:17.145683983 +0200
+@@ -425,7 +425,7 @@
+       if test "$found_py" = "1" -o "$found_py3" = "1"; then
+         # Reset everything, so that we can look for another Python.
+           m4_foreach([mym4pythonver],
+-                     [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[all]],
++                     [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[3.10],[all]],
+            [unset PYTHON
+           unset PYTHON_VERSION
+           unset PYTHON_CPPFLAGS
+--- gpgme-1.17.1/m4/python.m4~ 2020-07-15 12:14:17.000000000 +0200
++++ gpgme-1.17.1/m4/python.m4  2022-04-01 12:59:57.815661123 +0200
+@@ -42,7 +42,7 @@
+   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+ [python2 python2.7 dnl
+  python dnl
+- python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4
++ python3 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4
+  ])
+ 
+   AC_ARG_VAR([PYTHON], [the Python interpreter])