From 7ec013f06f0e2fa557eefb320e610adc6cb54ef02d22b7e1d0de7d8e4fa5d324 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Wed, 25 Oct 2023 11:51:29 +0000 Subject: [PATCH] Accepting request 1120231 from home:pmonrealgonzalez:branches:Base:System - Update to 1.23.0: * Support GPGME_ENCRYPT_ALWAYS_TRUST also for S/MIME. [T6559] * New keylist mode GPGME_KEYLIST_MODE_WITH_V5FPR. [T6705] * New key capability flags has_*. [T6748] * gpgme-tool: Support use of Windows HANDLE. [T6634] * qt: Support refreshing keys via WKD. [T6672] * qt: Handle cancel in changeexpiryjob. [T6754] * Remove patches fixed upstream: - gpgme-qt-tests-Fix-build-in-source-directory.patch - gpgme-build-Suggest-out-of-source-build.patch OBS-URL: https://build.opensuse.org/request/show/1120231 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=160 --- gpgme-1.22.0.tar.bz2 | 3 - gpgme-1.22.0.tar.bz2.sig | Bin 119 -> 0 bytes gpgme-1.23.0.tar.bz2 | 3 + gpgme-1.23.0.tar.bz2.sig | Bin 0 -> 119 bytes gpgme-build-Suggest-out-of-source-build.patch | 27 ------- ...-tests-Fix-build-in-source-directory.patch | 71 ------------------ gpgme.changes | 14 ++++ gpgme.spec | 5 +- 8 files changed, 18 insertions(+), 105 deletions(-) delete mode 100644 gpgme-1.22.0.tar.bz2 delete mode 100644 gpgme-1.22.0.tar.bz2.sig create mode 100644 gpgme-1.23.0.tar.bz2 create mode 100644 gpgme-1.23.0.tar.bz2.sig delete mode 100644 gpgme-build-Suggest-out-of-source-build.patch delete mode 100644 gpgme-qt-tests-Fix-build-in-source-directory.patch diff --git a/gpgme-1.22.0.tar.bz2 b/gpgme-1.22.0.tar.bz2 deleted file mode 100644 index 5acfe30..0000000 --- a/gpgme-1.22.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71 -size 1717836 diff --git a/gpgme-1.22.0.tar.bz2.sig b/gpgme-1.22.0.tar.bz2.sig deleted file mode 100644 index 19d3550b4982283595ef27529d77d33e006a1cf3a4216715588e2adef70dc5f5..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAuWnmEGV2~A4WXWBXm$E!p!y#PSlPRcU`VKV*t6Qv0DUZc(GH`JUz(m#tGcsIV z)qW}Dt$kqQvJ4M4>$G6^^vXi<8-IM>EYUn6<-G@};;8k?l}l&$PTtWo|K9#f(ewVE T@IE8HMB;}%t4`}LJ2PGY3Lh|) diff --git a/gpgme-1.23.0.tar.bz2 b/gpgme-1.23.0.tar.bz2 new file mode 100644 index 0000000..6918ba4 --- /dev/null +++ b/gpgme-1.23.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:043e2efe18b4ad22b96d434dde763fbed32cf8d6c220dc69df0d0ffb9dc66fc6 +size 1717618 diff --git a/gpgme-1.23.0.tar.bz2.sig b/gpgme-1.23.0.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..4c1bb329f33ebcb5cfbb8192d4d22c8e8443be6782ae468cd3ca78e406c57777 GIT binary patch literal 119 zcmeAuWnmEGV2~A4WXWBXm$E!p!y#PSlPRcU`VKV*t6Qv0sTOw<7`QkEU?Mdk41Wb> zZ~X{cYM!<@H*({<;H5bNUNhf4TVmySIU&z(mq1e*!#}GO)`ZP@!8a1RG!1M2KM|O6 U+3EASkM6%*iY^;G`H{~701DwT)Bpeg literal 0 HcmV?d00001 diff --git a/gpgme-build-Suggest-out-of-source-build.patch b/gpgme-build-Suggest-out-of-source-build.patch deleted file mode 100644 index 04b5657..0000000 --- a/gpgme-build-Suggest-out-of-source-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 24a8c279da98fe7e586a9fc3cd91175c9e60ffef Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= -Date: Mon, 21 Aug 2023 21:32:40 +0200 -Subject: build: Suggest out-of-source build - -* autogen.rc (final_info): Suggest to run configure from a build -subdirectory. --- - -We recommend out-of-source builds. The suggestion what to do next shown -by autogen.sh should reflect this. - -GnuPG-bug-id: 6673 - -diff --git a/autogen.rc b/autogen.rc -index 1759ef93..6d6ea93f 100644 ---- a/autogen.rc -+++ b/autogen.rc -@@ -11,4 +11,4 @@ case "$myhost" in - esac - - --final_info="./configure --enable-maintainer-mode && make" -+final_info="mkdir build && cd build && ../configure --enable-maintainer-mode && make" --- -2.41.0 - diff --git a/gpgme-qt-tests-Fix-build-in-source-directory.patch b/gpgme-qt-tests-Fix-build-in-source-directory.patch deleted file mode 100644 index 2d32325..0000000 --- a/gpgme-qt-tests-Fix-build-in-source-directory.patch +++ /dev/null @@ -1,71 +0,0 @@ -From d23528cadf4284f508bc4ba05e1b5c14b46bd354 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= -Date: Mon, 21 Aug 2023 21:08:01 +0200 -Subject: qt,tests: Fix build in source directory - -* lang/qt/tests/Makefile.am (AM_CPPFLAGS): Include Qt binding sources -before C++ binding sources and C sources. --- - -This fixes the problem that the debug.h in the C sources was found -before the one in the Qt bindings. - -GnuPG-bug-id: 6673 - -diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am -index 32ad6466..aedd3264 100644 ---- a/lang/qt/tests/Makefile.am -+++ b/lang/qt/tests/Makefile.am -@@ -51,10 +51,10 @@ LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \ - ../../../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@ -DBUILDING_QGPGME \ -- -I$(top_srcdir)/lang/qt/src \ - -DTOP_SRCDIR="$(top_srcdir)" - endif - if WANT_QT6 --- -2.41.0 - -From aee18a2ab2498bc6092bef518c532796bbe5b502 Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Tue, 22 Aug 2023 00:12:05 +0200 -Subject: qt,tests: Fix build in source directory, part 2 - -* lang/qt/tests/Makefile.am (AM_CPPFLAGS): Include Qt binding sources -before C++ binding sources and C sources. --- - -This fixes the problem that the debug.h in the C sources was found -before the one in the Qt bindings. - -Commit d23528cadf4284f508bc4ba05e1b5c14b46bd354 fixed it for Qt5, we -need Qt6 as well. - -GnuPG-bug-id: 6673 - -diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am -index aedd3264..615daf6d 100644 ---- a/lang/qt/tests/Makefile.am -+++ b/lang/qt/tests/Makefile.am -@@ -62,10 +62,10 @@ LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgmeqt6.la \ - ../../../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@ -DBUILDING_QGPGME \ -- -I$(top_srcdir)/lang/qt/src \ - -DTOP_SRCDIR="$(top_srcdir)" - endif - --- -2.41.0 - diff --git a/gpgme.changes b/gpgme.changes index 224b6bd..407a583 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Oct 25 10:56:48 UTC 2023 - Pedro Monreal + +- Update to 1.23.0: + * Support GPGME_ENCRYPT_ALWAYS_TRUST also for S/MIME. [T6559] + * New keylist mode GPGME_KEYLIST_MODE_WITH_V5FPR. [T6705] + * New key capability flags has_*. [T6748] + * gpgme-tool: Support use of Windows HANDLE. [T6634] + * qt: Support refreshing keys via WKD. [T6672] + * qt: Handle cancel in changeexpiryjob. [T6754] + * Remove patches fixed upstream: + - gpgme-qt-tests-Fix-build-in-source-directory.patch + - gpgme-build-Suggest-out-of-source-build.patch + ------------------------------------------------------------------- Sat Sep 23 23:26:53 UTC 2023 - Christophe Marin diff --git a/gpgme.spec b/gpgme.spec index 9e277a7..be6ecf8 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -33,7 +33,7 @@ %bcond_without qt6 %endif Name: gpgme%{psuffix} -Version: 1.22.0 +Version: 1.23.0 Release: 0 Summary: Programmatic library interface to GnuPG License: GPL-3.0-or-later AND LGPL-2.1-or-later @@ -50,9 +50,6 @@ Source99: gpgme.changes Patch1: gpgme-D545-python310.patch # PATCH-FIX-OPENSUSE gpgme-suse-nobetasuffix.patch code@bnavigator.de -- remove "-unknown" betasuffix boo#1205197 Patch2: gpgme-suse-nobetasuffix.patch -# PATCH-FIX-UPSTREAM Fix building with qt -Patch3: gpgme-qt-tests-Fix-build-in-source-directory.patch -Patch4: gpgme-build-Suggest-out-of-source-build.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++