From dee39fe3659a41dc6b88142064f0ac80efd41d8a Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Apr 30 2020 12:50:17 +0000
Subject: Fix FTBFS with gnupg-2.2.19 and above


---

diff --git a/gpgme-build-with-gnupg-2.2.19.patch b/gpgme-build-with-gnupg-2.2.19.patch
new file mode 100644
index 0000000..4788f8b
--- /dev/null
+++ b/gpgme-build-with-gnupg-2.2.19.patch
@@ -0,0 +1,27 @@
+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 de6b7cd..cc63035 100644
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -10,7 +10,7 @@
 Name:           gpgme
 Summary:        GnuPG Made Easy - high level crypto API
 Version:        1.13.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 License:        LGPLv2+
 URL:            https://gnupg.org/related_software/gpgme/
@@ -24,6 +24,8 @@ 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
@@ -213,6 +215,9 @@ make check
 %{python3_sitearch}/gpg/
 
 %changelog
+* Thu Apr 30 2020 Tomáš Mráz <tmraz@redhat.com> - 1.13.1-7
+- Fix FTBFS with gnupg-2.2.19 and above
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild