commit 948a8e18b5aa6227643f5385cfa7802187f536d9 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Fri Oct 20 20:16:03 2023 +0200
- updated to 1.22.0 0001-fix-stupid-ax_python_devel.patch | 76 ----------------------------------- gpgme-qt-tests.patch | 27 +++++++++++++ gpgme.spec | 6 ++- 3 files changed, 31 insertions(+), 78 deletions(-) --- diff --git a/gpgme.spec b/gpgme.spec index bd53ec8..64d68db 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -24,18 +24,19 @@ Summary: Library for accessing GnuPG Summary(pl.UTF-8): Biblioteka dająca dostęp do funkcji GnuPG Name: gpgme -Version: 1.21.0 +Version: 1.22.0 Release: 1 Epoch: 1 License: LGPL v2.1+ Group: Libraries Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2 -# Source0-md5: 3a83288e753a7da53a5626d29e4416fd +# Source0-md5: 828b8a1f9992826d7ad43741b349db01 Patch0: %{name}-info.patch Patch1: orig-version.patch Patch2: %{name}-largefile.patch Patch3: %{name}-python.patch Patch4: 0001-fix-stupid-ax_python_devel.patch +Patch5: %{name}-qt-tests.patch URL: http://www.gnupg.org/gpgme.html BuildRequires: autoconf >= 2.69 BuildRequires: automake >= 1:1.14 @@ -291,6 +292,7 @@ PyME to interfejs Pythona do biblioteki GPGME. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %{__libtoolize} diff --git a/0001-fix-stupid-ax_python_devel.patch b/0001-fix-stupid-ax_python_devel.patch index 46ad827..11f7b56 100644 --- a/0001-fix-stupid-ax_python_devel.patch +++ b/0001-fix-stupid-ax_python_devel.patch @@ -22,79 +22,3 @@ index b990d5b3..318b089c 100644 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-qt-tests.patch b/gpgme-qt-tests.patch new file mode 100644 index 0000000..80de01e --- /dev/null +++ b/gpgme-qt-tests.patch @@ -0,0 +1,27 @@ +qt tests want debug.h from lang/qt/src, not the one from src +--- gpgme-1.22.0/lang/qt/tests/Makefile.am.orig 2023-10-20 19:20:27.323100921 +0200 ++++ gpgme-1.22.0/lang/qt/tests/Makefile.am 2023-10-20 20:01:44.799679279 +0200 +@@ -51,10 +51,9 @@ LDADD = ../../cpp/src/libgpgmepp.la ../s + ../../../src/libgpgme.la @GPGME_QT5_LIBS@ @GPG_ERROR_LIBS@ \ + @GPGME_QT5TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++ + +-AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ ++AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ + @GPG_ERROR_CFLAGS@ @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ \ + @LIBASSUAN_CFLAGS@ @GPGME_QT5TEST_CFLAGS@ @FILE_OFFSET_BITS_CPPFLAGS@ -DBUILDING_QGPGME \ +- -I$(top_srcdir)/lang/qt/src \ + -DTOP_SRCDIR="$(top_srcdir)" + endif + if WANT_QT6 +@@ -62,10 +61,9 @@ LDADD = ../../cpp/src/libgpgmepp.la ../s + ../../../src/libgpgme.la @GPGME_QT6_LIBS@ @GPG_ERROR_LIBS@ \ + @GPGME_QT6TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++ + +-AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ ++AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ + @GPG_ERROR_CFLAGS@ @GPGME_QT6_CFLAGS@ @GPG_ERROR_CFLAGS@ \ + @LIBASSUAN_CFLAGS@ @GPGME_QT6TEST_CFLAGS@ @FILE_OFFSET_BITS_CPPFLAGS@ -DBUILDING_QGPGME \ +- -I$(top_srcdir)/lang/qt/src \ + -DTOP_SRCDIR="$(top_srcdir)" + endif + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gpgme.git/commitdiff/948a8e18b5aa6227643f5385cfa7802187f536d9 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit