From 96638a38593814d9eec57af46d0be825e2026872b940bd2b9cfd577a2a492598 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Tue, 14 Jul 2020 11:02:50 +0000 Subject: [PATCH] Accepting request 820860 from home:pmonrealgonzalez:branches:Base:System - Fix build from a regression in the latest gpg2 update [bsc#1174007] - Remove gpgme-fix-t-encrypt-sym.patch OBS-URL: https://build.opensuse.org/request/show/820860 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=120 --- gpgme-fix-t-encrypt-sym.patch | 13 ------------- gpgme.changes | 6 ++++++ gpgme.spec | 1 - 3 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 gpgme-fix-t-encrypt-sym.patch diff --git a/gpgme-fix-t-encrypt-sym.patch b/gpgme-fix-t-encrypt-sym.patch deleted file mode 100644 index f942f8e..0000000 --- a/gpgme-fix-t-encrypt-sym.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gpgme-1.13.1/lang/python/tests/t-encrypt-sym.py -=================================================================== ---- gpgme-1.13.1.orig/lang/python/tests/t-encrypt-sym.py -+++ gpgme-1.13.1/lang/python/tests/t-encrypt-sym.py -@@ -44,7 +44,7 @@ for passphrase in ("abc", b"abc"): - c.set_passphrase_cb(passphrase_cb, None) - - c.op_encrypt([], 0, source, cipher) -- assert passphrase_cb_called == 1, \ -+ assert passphrase_cb_called == 2, \ - "Callback called {} times".format(passphrase_cb_called) - support.print_data(cipher) - diff --git a/gpgme.changes b/gpgme.changes index 6e7b6cd..14092a0 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 14 10:35:27 UTC 2020 - Pedro Monreal Gonzalez + +- Fix build from a regression in the latest gpg2 update [bsc#1174007] +- Remove gpgme-fix-t-encrypt-sym.patch + ------------------------------------------------------------------- Fri Jul 10 14:45:50 UTC 2020 - Pedro Monreal Gonzalez diff --git a/gpgme.spec b/gpgme.spec index e99d47a..dfdcbf3 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -47,7 +47,6 @@ Patch2: gpgme-t-json-test-with-keygrip-when-listing-keys.patch # required to make notmuch's testsuite pass, see # id:87366av72u.fsf@fifthhorseman.net on notmuch@notmuchmail.org Patch3: 0001-gpg-Avoid-error-diagnostics-with-override-session-ke.patch -Patch4: gpgme-fix-t-encrypt-sym.patch BuildRequires: gcc-c++ BuildRequires: gpg2 >= 2.0.10 BuildRequires: libassuan-devel >= 2.4.2