diff --git a/.gitignore b/.gitignore index 2bbcbea..4f34e9d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /gpgme-1.11.1.tar.bz2 /gpgme-1.12.0.tar.bz2 /gpgme-1.13.1.tar.bz2 +/gpgme-1.14.0.tar.bz2 diff --git a/gpgme-build-with-gnupg-2.2.19.patch b/gpgme-build-with-gnupg-2.2.19.patch deleted file mode 100644 index 4788f8b..0000000 --- a/gpgme-build-with-gnupg-2.2.19.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up gpgme-1.13.1/src/engine-gpg.c.build gpgme-1.13.1/src/engine-gpg.c ---- gpgme-1.13.1/src/engine-gpg.c.build 2019-06-13 08:45:22.000000000 +0200 -+++ gpgme-1.13.1/src/engine-gpg.c 2020-04-30 14:30:35.550253558 +0200 -@@ -2920,6 +2920,12 @@ gpg_keylist_build_options (engine_gpg_t - - err = add_arg (gpg, "--with-colons"); - -+ if (have_gpg_version (gpg, "2.2.19")) -+ { -+ if (!err) -+ err = add_arg (gpg, "--with-keygrip"); -+ } -+ - /* Since gpg 2.1.15 fingerprints are always printed, thus there is - * no more need to explicitly request them. */ - if (!have_gpg_version (gpg, "2.1.15")) -diff -up gpgme-1.13.1/tests/json/t-keylist-secret.out.json.build gpgme-1.13.1/tests/json/t-keylist-secret.out.json ---- gpgme-1.13.1/tests/json/t-keylist-secret.out.json.build 2018-12-03 10:37:25.000000000 +0100 -+++ gpgme-1.13.1/tests/json/t-keylist-secret.out.json 2020-04-30 14:24:40.904707411 +0200 -@@ -91,7 +91,6 @@ - "can_sign": true, - "can_certify": true, - "can_authenticate": true, -- "secret": true, - "is_qualified": false, - "protocol": "OpenPGP", - "fingerprint": "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2", diff --git a/gpgme.spec b/gpgme.spec index d254698..d76fd9d 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -9,8 +9,8 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API -Version: 1.13.1 -Release: 8%{?dist} +Version: 1.14.0 +Release: 1%{?dist} License: LGPLv2+ URL: https://gnupg.org/related_software/gpgme/ @@ -24,8 +24,6 @@ Patch1001: 0001-don-t-add-extra-libraries-for-linking.patch Patch1002: gpgme-1.3.2-largefile.patch # Let's fix stupid AX_PYTHON_DEVEL Patch1003: 0001-fix-stupid-ax_python_devel.patch -# Make the make check work with gnupg-2.2.19 and above -Patch1004: gpgme-build-with-gnupg-2.2.19.patch #BuildRequires: autoconf #BuildRequires: automake @@ -215,6 +213,9 @@ make check %{python3_sitearch}/gpg/ %changelog +* Sat Jul 18 2020 Igor Raits - 1.14.0-1 +- Update to 1.14.0 + * Fri May 22 2020 Miro HronĨok - 1.13.1-8 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 4dc226e..745b25f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gpgme-1.13.1.tar.bz2) = 11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8 +SHA512 (gpgme-1.14.0.tar.bz2) = b7ffa30a046c75215e1c73e2f34e5e65532e4dcf6bea55796adc6f82fd38dafe264bcd4332b2001155d6f9476d6fd82a77112dad31c1bb29db9ddefc532ae668