diff --git a/gpgme-1.23.2.tar.bz2 b/gpgme-1.23.2.tar.bz2 deleted file mode 100644 index 1a261ef..0000000 --- a/gpgme-1.23.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224 -size 1836904 diff --git a/gpgme-1.23.2.tar.bz2.sig b/gpgme-1.23.2.tar.bz2.sig deleted file mode 100644 index 61eb854..0000000 Binary files a/gpgme-1.23.2.tar.bz2.sig and /dev/null differ diff --git a/gpgme-1.24.0.tar.bz2 b/gpgme-1.24.0.tar.bz2 new file mode 100644 index 0000000..23d2b08 --- /dev/null +++ b/gpgme-1.24.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da +size 1889410 diff --git a/gpgme-1.24.0.tar.bz2.sig b/gpgme-1.24.0.tar.bz2.sig new file mode 100644 index 0000000..c953144 Binary files /dev/null and b/gpgme-1.24.0.tar.bz2.sig differ diff --git a/gpgme-D545-obsolete-distutils.patch b/gpgme-D545-obsolete-distutils.patch deleted file mode 100644 index 418bacb..0000000 --- a/gpgme-D545-obsolete-distutils.patch +++ /dev/null @@ -1,795 +0,0 @@ -From e3ae88267f03b435ec7d9e80ae1e2891e1f118e6 Mon Sep 17 00:00:00 2001 -From: Ingo Klöcker -Date: Tue, 16 Jan 2024 09:53:39 +0100 -Subject: build: Update Python autoconf macro - -* configure.ac: Call AX_PYTHON_DEVEL with new "optional" argument. -* m4/ax_python_devel.m4: Replace with current version from the autoconf -archive. --- - -The new "optional" argument allows us to leave out one of our custom -changes. - -diff --git a/configure.ac b/configure.ac -index 9d551813..0e0b9d97 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -607,7 +607,7 @@ if test "$found_py" = "1"; then - unset am_cv_python_pythondir - unset am_cv_python_pyexecdir - AM_PATH_PYTHON(mym4pythonver, [ -- AX_PYTHON_DEVEL -+ AX_PYTHON_DEVEL([], [true]) - if test "$PYTHON_VERSION"; then - PYTHONS="$(echo $PYTHONS $PYTHON)" - PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)" -diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 -index 55f0cfff..1f480db6 100644 ---- a/m4/ax_python_devel.m4 -+++ b/m4/ax_python_devel.m4 -@@ -1,10 +1,10 @@ - # =========================================================================== --# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html -+# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html - # =========================================================================== - # - # SYNOPSIS - # --# AX_PYTHON_DEVEL([version]) -+# AX_PYTHON_DEVEL([version[,optional]]) - # - # DESCRIPTION - # -@@ -12,8 +12,8 @@ - # in your configure.ac. - # - # This macro checks for Python and tries to get the include path to --# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) --# output variables. It also exports $(PYTHON_EXTRA_LIBS) and -+# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output -+# variables. It also exports $(PYTHON_EXTRA_LIBS) and - # $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. - # - # You can search for some particular version of Python by passing a -@@ -23,6 +23,11 @@ - # version number. Don't use "PYTHON_VERSION" for this: that environment - # variable is declared as precious and thus reserved for the end-user. - # -+# By default this will fail if it does not detect a development version of -+# python. If you want it to continue, set optional to true, like -+# AX_PYTHON_DEVEL([], [true]). The ax_python_devel_found variable will be -+# "no" if it fails. -+# - # This macro should work for all versions of Python >= 2.1.0. As an end - # user, you can disable the check for the python version by setting the - # PYTHON_NOVERSIONCHECK environment variable to something else than the -@@ -67,10 +72,18 @@ - # modified version of the Autoconf Macro, you may extend this special - # exception to the GPL to apply to your modified version as well. - --#serial 17 -+#serial 36 - - AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) - AC_DEFUN([AX_PYTHON_DEVEL],[ -+ # Get whether it's optional -+ if test -z "$2"; then -+ ax_python_devel_optional=false -+ else -+ ax_python_devel_optional=$2 -+ fi -+ ax_python_devel_found=yes -+ - # - # Allow the use of a (user set) custom python version - # -@@ -81,81 +94,147 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ - - AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) - if test -z "$PYTHON"; then -- AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path]) -+ AC_MSG_WARN([Cannot find python$PYTHON_VERSION in your system path]) -+ if ! $ax_python_devel_optional; then -+ AC_MSG_ERROR([Giving up, python development not available]) -+ fi -+ ax_python_devel_found=no - PYTHON_VERSION="" - fi - -- # -- # Check for a version of Python >= 2.1.0 -- # -- AC_MSG_CHECKING([for a version of Python >= '2.1.0']) -- ac_supports_python_ver=`$PYTHON -c "import sys; \ -+ if test $ax_python_devel_found = yes; then -+ # -+ # Check for a version of Python >= 2.1.0 -+ # -+ AC_MSG_CHECKING([for a version of Python >= '2.1.0']) -+ ac_supports_python_ver=`$PYTHON -c "import sys; \ - ver = sys.version.split ()[[0]]; \ - print (ver >= '2.1.0')"` -- if test "$ac_supports_python_ver" != "True"; then -+ if test "$ac_supports_python_ver" != "True"; then - if test -z "$PYTHON_NOVERSIONCHECK"; then - AC_MSG_RESULT([no]) -- AC_MSG_FAILURE([ -+ AC_MSG_WARN([ - This version of the AC@&t@_PYTHON_DEVEL macro - doesn't work properly with versions of Python before - 2.1.0. You may need to re-run configure, setting the --variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, -+variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, - PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. - Moreover, to disable this check, set PYTHON_NOVERSIONCHECK - to something else than an empty string. - ]) -+ if ! $ax_python_devel_optional; then -+ AC_MSG_FAILURE([Giving up]) -+ fi -+ ax_python_devel_found=no -+ PYTHON_VERSION="" - else - AC_MSG_RESULT([skip at user request]) - fi -- else -+ else - AC_MSG_RESULT([yes]) -+ fi - fi - -- # -- # if the macro parameter ``version'' is set, honour it -- # -- if test -n "$1"; then -+ if test $ax_python_devel_found = yes; then -+ # -+ # If the macro parameter ``version'' is set, honour it. -+ # A Python shim class, VPy, is used to implement correct version comparisons via -+ # string expressions, since e.g. a naive textual ">= 2.7.3" won't work for -+ # Python 2.7.10 (the ".1" being evaluated as less than ".3"). -+ # -+ if test -n "$1"; then - AC_MSG_CHECKING([for a version of Python $1]) -- ac_supports_python_ver=`$PYTHON -c "import sys; \ -- ver = sys.version.split ()[[0]]; \ -+ cat << EOF > ax_python_devel_vpy.py -+class VPy: -+ def vtup(self, s): -+ return tuple(map(int, s.strip().replace("rc", ".").split("."))) -+ def __init__(self): -+ import sys -+ self.vpy = tuple(sys.version_info)[[:3]] -+ def __eq__(self, s): -+ return self.vpy == self.vtup(s) -+ def __ne__(self, s): -+ return self.vpy != self.vtup(s) -+ def __lt__(self, s): -+ return self.vpy < self.vtup(s) -+ def __gt__(self, s): -+ return self.vpy > self.vtup(s) -+ def __le__(self, s): -+ return self.vpy <= self.vtup(s) -+ def __ge__(self, s): -+ return self.vpy >= self.vtup(s) -+EOF -+ ac_supports_python_ver=`$PYTHON -c "import ax_python_devel_vpy; \ -+ ver = ax_python_devel_vpy.VPy(); \ - print (ver $1)"` -+ rm -rf ax_python_devel_vpy*.py* __pycache__/ax_python_devel_vpy*.py* - if test "$ac_supports_python_ver" = "True"; then -- AC_MSG_RESULT([yes]) -+ AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([this package requires Python $1. -+ AC_MSG_WARN([this package requires Python $1. - If you have it installed, but it isn't the default Python - interpreter in your system path, please pass the PYTHON_VERSION - variable to configure. See ``configure --help'' for reference. - ]) -+ if ! $ax_python_devel_optional; then -+ AC_MSG_ERROR([Giving up]) -+ fi -+ ax_python_devel_found=no - PYTHON_VERSION="" - fi -+ fi - fi - -- # -- # Check if you have distutils, else fail -- # -- 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 $ax_python_devel_found = yes; then -+ # -+ # Check if you have distutils, else fail -+ # -+ AC_MSG_CHECKING([for the sysconfig Python package]) -+ ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1` -+ if test $? -eq 0; then - AC_MSG_RESULT([yes]) -- else -+ IMPORT_SYSCONFIG="import sysconfig" -+ else - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([cannot import Python module "distutils". -+ -+ AC_MSG_CHECKING([for the distutils Python package]) -+ ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1` -+ if test $? -eq 0; then -+ AC_MSG_RESULT([yes]) -+ IMPORT_SYSCONFIG="from distutils import sysconfig" -+ else -+ AC_MSG_WARN([cannot import Python module "distutils". - Please check your Python installation. The error was: --$ac_distutils_result]) -- PYTHON_VERSION="" -+$ac_sysconfig_result]) -+ if ! $ax_python_devel_optional; then -+ AC_MSG_ERROR([Giving up]) -+ fi -+ ax_python_devel_found=no -+ PYTHON_VERSION="" -+ fi -+ fi - fi - -- # -- # Check for Python include path -- # -- AC_MSG_CHECKING([for Python include path]) -- if test -z "$PYTHON_CPPFLAGS"; then -- python_path=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_inc ());"` -- plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_inc (plat_specific=1));"` -+ if test $ax_python_devel_found = yes; then -+ # -+ # Check for Python include path -+ # -+ AC_MSG_CHECKING([for Python include path]) -+ if test -z "$PYTHON_CPPFLAGS"; then -+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then -+ # sysconfig module has different functions -+ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_path ('include'));"` -+ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_path ('platinclude'));"` -+ else -+ # old distutils way -+ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_python_inc ());"` -+ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_python_inc (plat_specific=1));"` -+ fi - if test -n "${python_path}"; then - if test "${plat_python_path}" != "${python_path}"; then - python_path="-I$python_path -I$plat_python_path" -@@ -164,22 +243,22 @@ $ac_distutils_result]) - fi - fi - PYTHON_CPPFLAGS=$python_path -- fi -- AC_MSG_RESULT([$PYTHON_CPPFLAGS]) -- AC_SUBST([PYTHON_CPPFLAGS]) -+ fi -+ AC_MSG_RESULT([$PYTHON_CPPFLAGS]) -+ AC_SUBST([PYTHON_CPPFLAGS]) - -- # -- # Check for Python library path -- # -- AC_MSG_CHECKING([for Python library path]) -- if test -z "$PYTHON_LDFLAGS"; then -+ # -+ # Check for Python library path -+ # -+ AC_MSG_CHECKING([for Python library path]) -+ if test -z "$PYTHON_LIBS"; then - # (makes two attempts to ensure we've got a version number - # from the interpreter) - ac_python_version=`cat<]], - [[Py_Initialize();]]) - ],[pythonexists=yes],[pythonexists=no]) -- AC_LANG_POP([C]) -- # turn back to default flags -- CPPFLAGS="$ac_save_CPPFLAGS" -- LIBS="$ac_save_LIBS" -+ AC_LANG_POP([C]) -+ # turn back to default flags -+ CPPFLAGS="$ac_save_CPPFLAGS" -+ LIBS="$ac_save_LIBS" -+ LDFLAGS="$ac_save_LDFLAGS" - -- AC_MSG_RESULT([$pythonexists]) -+ AC_MSG_RESULT([$pythonexists]) - -- if test ! "x$pythonexists" = "xyes"; then -- AC_MSG_WARN([ -+ if test ! "x$pythonexists" = "xyes"; then -+ AC_MSG_WARN([ - Could not link test program to Python. Maybe the main Python library has been - installed in some non-standard library path. If so, pass it to configure, -- via the LDFLAGS environment variable. -- Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib" -+ via the LIBS environment variable. -+ Example: ./configure LIBS="-L/usr/non-standard-path/python/lib" - ============================================================================ -+ ERROR! - You probably have to install the development version of the Python package - for your distribution. The exact name of this package varies among them. - ============================================================================ -- ]) -- PYTHON_VERSION="" -+ ]) -+ if ! $ax_python_devel_optional; then -+ AC_MSG_ERROR([Giving up]) -+ fi -+ ax_python_devel_found=no -+ PYTHON_VERSION="" -+ fi - fi - - # -From cc1f2b5acb8484edf0a722dcccac435687576a44 Mon Sep 17 00:00:00 2001 -From: Ingo Klöcker -Date: Tue, 16 Jan 2024 09:58:33 +0100 -Subject: build: Re-add still needed custom changes to Python autoconf macro - -* m4/ax_python_devel.m4: Do not emit 'HAVE_PYTHON'. --- - -This reapplies the changes made with 5189c08 that are still needed for -detecting multiple Python versions. - -diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 -index 1f480db6..8116028a 100644 ---- a/m4/ax_python_devel.m4 -+++ b/m4/ax_python_devel.m4 -@@ -274,8 +274,11 @@ EOD` - fi - - # Make the versioning information available to the compiler -- AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"], -- [If available, contains the Python version number currently in use.]) -+ -+ # JW: We don't need it and it interferes with the hack -+ # to detect multiple Python versions -+ #AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"], -+ # [If available, contains the Python version number currently in use.]) - - # First, the library directory: - ac_python_libdir=`cat</dev/null))) else ingit=no - beta=yes - tmp="-unknown" ++ beta=no + tmp="" + cid="0000000" rev="0000000" rvd="0" - fi diff --git a/gpgme.changes b/gpgme.changes index 8a78989..4fbacc7 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,130 @@ +------------------------------------------------------------------- +Wed Nov 20 12:14:56 UTC 2024 - Pedro Monreal + +- Move the gpg python bindings out of the egg directory. + +------------------------------------------------------------------- +Mon Nov 18 10:17:30 UTC 2024 - Christophe Marin + +- Fix file list on Leap 15 + +------------------------------------------------------------------- +Wed Nov 13 12:05:35 UTC 2024 - Pedro Monreal + +- Update to 1.24.0: + * Extended gpgme_op_decrypt* and gpgme_op_verify* to allow writing the + output directly to a file. [T6550] + * Extended gpgme_op_encrypt*, gpgme_op_encrypt_sign*, and gpgme_op_sign* + to allow reading the input data directly from a file. [T6550] + * Add information about designated revocation keys. [T7118] + * New context flag "import-options". [T7152] + * New context flag "proc-all-sigs". [T7261] + * New context flag "known-notations". [T4060] + * New info flags "beta_compliance". [rM1a7bc88ee7] + * New function gpgme_op_setownertrust to make changing the owner trust + easier and to allow enabling/disabling of keys (requires GnuPG 2.4.6). [T7239] + * New flag to re-encrypt OpenPGP data (requires GnuPG 2.5.1). [T1825] + * cpp: Provide information about designated revocation keys for a Key. [T7118] + * cpp: Add safer member function returning text describing an error. [T5960] + * cpp: Add support for setting the owner trust of keys and for enabling + and disabling keys. [T7239] + * qt: Build QGpgME for Qt 5 and Qt 6 simultaneously. [T7205] + * qt: Install headers for Qt 5 and Qt 6 in separate folders. [T7161] + * qt: Allow reading the data to decrypt/encrypt/sign/verify directly from + files. [T6550] + * qt: Allow writing the decrypted/encrypted/signed/verified data directly + to files. [T6550] + * qt: Allow specifying import options when importing keys. [T7152] + * qt: Allow appending a detached signature to an existing file. [T6867] + * qt: Add support for enabling and disabling keys. [T7239] + * qt: Add support for new context flag "proc-all-sigs" to the jobs that + verify data signatures. + * Interface changes relative to the 1.23.2 release: + - GPGME_ENCRYPT_FILE NEW. + - GPGME_SIG_MODE_FILE NEW. + - GPGME_ENCRYPT_ADD_RECP NEW. + - GPGME_ENCRYPT_CHG_RECP NEW. + - gpgme_key_t EXT: New field 'revkeys'. + - gpgme_revocation_key_t NEW. + - gpgme_set_ctx_flag EXT: New flag 'import-options'. + - gpgme_set_ctx_flag EXT: New flag 'proc-all-sigs'. + - gpgme_set_ctx_flag EXT: New flag 'known-notation'. + - gpgme_op_setownertrust_start NEW. + - gpgme_op_setownertrust NEW. + - gpgme_subkey_t EXT: New field 'beta_compliance'. + - gpgme_signature_t EXT: New field 'beta_compliance'. + - gpgme_decrypt_result_t EXT: New field 'beta_compliance'. + - cpp: Context::EncryptFile NEW. + - cpp: Context::setOwnerTrust NEW. + - cpp: Context::startSetOwnerTrust NEW. + - cpp: Context::setKeyEnabled NEW. + - cpp: Context::startSetKeyEnabled NEW. + - cpp: SignatureMode::SignFile NEW. + - cpp: RevocationKey NEW. + - cpp: Key::revocationKey NEW. + - cpp: Key::numRevocationKeys NEW. + - cpp: Key::revocationKeys NEW. + - cpp: Key::isBetaCompliance NEW. + - cpp: Subkey::isBetaCompliance NEW. + - cpp: Error::asStdString NEW. + - cpp: Error::asString DEPRECATED. + - cpp: DecryptionResult::isBetaCompliance NEW. + - cpp: Signature::isBetaCompliance NEW. + - qt: DecryptVerifyArchiveJob::setProcessAllSignatures NEW. + - qt: DecryptVerifyArchiveJob::processAllSignatures NEW. + - qt: DecryptVerifyJob::setInputFile NEW. + - qt: DecryptVerifyJob::inputFile NEW. + - qt: DecryptVerifyJob::setOutputFile NEW. + - qt: DecryptVerifyJob::outputFile NEW. + - qt: DecryptVerifyJob::setProcessAllSignatures NEW. + - qt: DecryptVerifyJob::processAllSignatures NEW. + - qt: EncryptJob::setRecipients NEW. + - qt: EncryptJob::recipients NEW. + - qt: EncryptJob::setInputFile NEW. + - qt: EncryptJob::inputFile NEW. + - qt: EncryptJob::setOutputFile NEW. + - qt: EncryptJob::outputFile NEW. + - qt: EncryptJob::setEncryptionFlags NEW. + - qt: EncryptJob::encryptionFlags NEW. + - qt: SignEncryptJob::setSigners NEW. + - qt: SignEncryptJob::signers NEW. + - qt: SignEncryptJob::setRecipients NEW. + - qt: SignEncryptJob::recipients NEW. + - qt: SignEncryptJob::setInputFile NEW. + - qt: SignEncryptJob::inputFile NEW. + - qt: SignEncryptJob::setOutputFile NEW. + - qt: SignEncryptJob::outputFile NEW. + - qt: SignEncryptJob::setEncryptionFlags NEW. + - qt: SignEncryptJob::encryptionFlags NEW. + - qt: SignJob::setSigners NEW. + - qt: SignJob::signers NEW. + - qt: SignJob::setInputFile NEW. + - qt: SignJob::inputFile NEW. + - qt: SignJob::setOutputFile NEW. + - qt: SignJob::outputFile NEW. + - qt: SignJob::setSigningFlags NEW. + - qt: SignJob::signingFlags NEW. + - qt: SignJob::setAppendSignature NEW. + - qt: SignJob::appendSignatureEnabled NEW. + - qt: VerifyDetachedJob::setSignatureFile NEW. + - qt: VerifyDetachedJob::signatureFile NEW. + - qt: VerifyDetachedJob::setSignedFile NEW. + - qt: VerifyDetachedJob::signedFile NEW. + - qt: VerifyDetachedJob::setProcessAllSignatures NEW. + - qt: VerifyDetachedJob::processAllSignatures NEW. + - qt: VerifyOpaqueJob::setInputFile NEW. + - qt: VerifyOpaqueJob::inputFile NEW. + - qt: VerifyOpaqueJob::setOutputFile NEW. + - qt: VerifyOpaqueJob::outputFile NEW. + - qt: VerifyOpaqueJob::setProcessAllSignatures NEW. + - qt: VerifyOpaqueJob::processAllSignatures NEW. + - qt: ImportJob::setImportOptions NEW. + - qt: ImportJob::importOptions NEW. + - qt: QuickJob::startSetKeyEnabled NEW. + * Release-info: https://dev.gnupg.org/T7376 + * Rebase gpgme-suse-nobetasuffix.patch python313.patch + * Remove patch upstream: gpgme-D545-obsolete-distutils.patch + ------------------------------------------------------------------- Sun Sep 1 18:26:03 UTC 2024 - Dirk Müller diff --git a/gpgme.spec b/gpgme.spec index e46edce..43a1ebb 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -16,6 +16,7 @@ # +%define psuffix %{nil} %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "" %define psuffix %{nil} @@ -41,7 +42,7 @@ %endif Name: gpgme%{psuffix} -Version: 1.23.2 +Version: 1.24.0 Release: 0 Summary: Programmatic library interface to GnuPG License: GPL-3.0-or-later AND LGPL-2.1-or-later @@ -54,17 +55,15 @@ Source2: baselibs.conf Source3: https://gnupg.org/signature_key.asc#/gpgme.keyring # used to have a fixed timestamp Source99: gpgme.changes -# PATCH-FIX-UPSTREAM obsolete distutlils -- https://dev.gnupg.org/D545 -Patch1: gpgme-D545-obsolete-distutils.patch # PATCH-FIX-OPENSUSE gpgme-suse-nobetasuffix.patch code@bnavigator.de -- remove "-unknown" betasuffix boo#1205197 Patch2: gpgme-suse-nobetasuffix.patch Patch3: python313.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ -BuildRequires: gpg2 >= 2.0.10 +BuildRequires: gpg2 >= 2.4.1 BuildRequires: libassuan-devel >= 2.4.2 -BuildRequires: libgpg-error-devel >= 1.36 +BuildRequires: libgpg-error-devel >= 1.47 BuildRequires: pkgconfig BuildRequires: swig %if %{with python3} @@ -258,7 +257,7 @@ This package contains the bindings to use the library in Qt 6 C++ applications. %prep %autosetup -N -n gpgme-%{version} %if %{with replace_distutils} -%patch -p1 -P1 -P2 -P3 +%patch -p1 -P2 -P3 %endif %if 0%{suse_version} > 1500 # Note: rpm in 15.x does not know about the autopatch -m flag. @@ -313,9 +312,18 @@ rm -r %{buildroot}%{_infodir}/gpgme* rm -r %{buildroot}%{_libdir}/cmake/Gpgmepp rm -r %{buildroot}%{_libdir}/libgpgme* rm -r %{buildroot}%{_libdir}/pkgconfig/gpgme* +rm -r %{buildroot}%{_mandir}/man1/gpgme-json.* %endif popd +%if %{with python3} +# Move the gpg directory out of the newly added egg upstream directory +%if 0%{?suse_version} > 1500 +%python_expand mv %{buildroot}%{$python_sitearch}/gpg-%{version}*.egg/gpg %{buildroot}%{$python_sitearch}/gpg +%python_expand rm -rf %{buildroot}%{$python_sitearch}/gpg-%{version}*.egg +%endif +%endif + %check GPGME_DEBUG=2:mygpgme.log %make_build check skip=%{?qt_skip:%{qt_skip}} || cat $(find -name mygpgme.log -type f) @@ -341,6 +349,7 @@ GPGME_DEBUG=2:mygpgme.log %make_build check skip=%{?qt_skip:%{qt_skip}} || cat $ %{_datadir}/common-lisp %{_datadir}/common-lisp/source %{_infodir}/gpgme* +%{_mandir}/man1/gpgme-json.* %files -n libgpgme11 %license COPYING COPYING.LESSER LICENSES @@ -366,13 +375,16 @@ GPGME_DEBUG=2:mygpgme.log %make_build check skip=%{?qt_skip:%{qt_skip}} || cat $ %dir %{_libdir}/cmake %dir %{_libdir}/cmake/Gpgmepp %{_libdir}/cmake/Gpgmepp/GpgmeppConfig*.cmake +%{_libdir}/pkgconfig/gpgmepp.pc %endif %if %{with python3} %files %{python_files gpg} %license COPYING COPYING.LESSER LICENSES %{python_sitearch}/gpg -%{python_sitearch}/gpg-%{version}*-info +%if 0%{?suse_version} <= 1500 +%{python_sitearch}/gpg-%{version}*.egg-info +%endif %endif %if %{with qt} @@ -382,8 +394,7 @@ GPGME_DEBUG=2:mygpgme.log %make_build check skip=%{?qt_skip:%{qt_skip}} || cat $ %files -n libqgpgme-devel %license COPYING COPYING.LESSER LICENSES -%{_includedir}/qgpgme/ -%{_includedir}/QGpgME/ +%{_includedir}/qgpgme-qt5/ %dir %{_libdir}/cmake %dir %{_libdir}/cmake/QGpgme %{_libdir}/cmake/QGpgme/*.cmake @@ -397,8 +408,7 @@ GPGME_DEBUG=2:mygpgme.log %make_build check skip=%{?qt_skip:%{qt_skip}} || cat $ %files -n libqgpgmeqt6-devel %license COPYING COPYING.LESSER LICENSES -%{_includedir}/qgpgme/ -%{_includedir}/QGpgME/ +%{_includedir}/qgpgme-qt6/ %dir %{_libdir}/cmake %dir %{_libdir}/cmake/QGpgmeQt6 %{_libdir}/cmake/QGpgmeQt6/*.cmake diff --git a/python313.patch b/python313.patch index f44b2ed..fc2c09c 100644 --- a/python313.patch +++ b/python313.patch @@ -1,20 +1,20 @@ -Index: gpgme-1.23.2/configure.ac +Index: gpgme-1.24.0/configure.ac =================================================================== ---- gpgme-1.23.2.orig/configure.ac -+++ gpgme-1.23.2/configure.ac -@@ -591,7 +591,7 @@ if test "$found_py" = "1"; then +--- gpgme-1.24.0.orig/configure.ac ++++ gpgme-1.24.0/configure.ac +@@ -614,7 +614,7 @@ if test "$found_py" = "1"; then + 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],[3.10], -- [3.11],[3.12],[all]], -+ [3.11],[3.12],[3.13],[all]], +- [[2.7],[3.6],[3.8],[3.9],[3.10],[3.11],[3.12],[all]], ++ [[2.7],[3.6],[3.8],[3.9],[3.10],[3.11],[3.12],[3.13],[all]], [unset PYTHON unset PYTHON_VERSION unset PYTHON_CPPFLAGS -Index: gpgme-1.23.2/lang/python/setup.py.in +Index: gpgme-1.24.0/lang/python/setup.py.in =================================================================== ---- gpgme-1.23.2.orig/lang/python/setup.py.in -+++ gpgme-1.23.2/lang/python/setup.py.in +--- gpgme-1.24.0.orig/lang/python/setup.py.in ++++ gpgme-1.24.0/lang/python/setup.py.in @@ -291,6 +291,7 @@ GPGME and these bindings is available he 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', @@ -23,10 +23,10 @@ Index: gpgme-1.23.2/lang/python/setup.py.in 'Operating System :: POSIX', 'Operating System :: Microsoft :: Windows', 'Topic :: Communications :: Email', -Index: gpgme-1.23.2/m4/python.m4 +Index: gpgme-1.24.0/m4/python.m4 =================================================================== ---- gpgme-1.23.2.orig/m4/python.m4 -+++ gpgme-1.23.2/m4/python.m4 +--- gpgme-1.24.0.orig/m4/python.m4 ++++ gpgme-1.24.0/m4/python.m4 @@ -41,7 +41,7 @@ AC_DEFUN([AM_PATH_PYTHON], m4_define_default([_AM_PYTHON_INTERPRETER_LIST], [python2 python2.7 dnl