Update to 1.10.0

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

.gitignore

@@ -10,3 +10,4 @@
 # ignore emacs cruft
 /.#*
 /#*
+/gpgme-1.10.0.tar.bz2

0001-don-t-add-extra-libraries-for-linking.patch

@@ -1,4 +1,4 @@
-From 41ec8938dd1adab91f75440109f942a5743678ef Mon Sep 17 00:00:00 2001
+From 07a8ac908cbadb22c344895ebf9cc00c6a8fd3f7 Mon Sep 17 00:00:00 2001
 From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
 Date: Wed, 29 Mar 2017 07:05:41 +0200
 Subject: [PATCH] don't add extra libraries for linking
@@ -10,15 +10,15 @@ Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
-index 7f42f318..592b63c9 100644
+index 73f5eaad..3104d715 100644
 --- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
 +++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
 @@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
  
  set_target_properties(Gpgmepp PROPERTIES
    INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
--  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
-+  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so"
+-  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
++  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@"
    IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp@libsuffix@"
  )
  
@@ -43,5 +43,5 @@ index a4d152e1..6a854e4a 100644
  # Configure thread packages.
  thread_modules=""
 -- 
-2.12.1
+2.15.1
 

0001-qt-pass-fmt-to-gpgrt_asprintf.patch

@@ -1,27 +0,0 @@
-From 890b703e2b0c9e3905013593ab86f8783d4f6103 Mon Sep 17 00:00:00 2001
-From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
-Date: Wed, 29 Mar 2017 07:20:51 +0200
-Subject: [PATCH] qt: pass fmt to gpgrt_asprintf()
-
-References: https://bugs.gnupg.org/gnupg/issue3023
-Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
----
- lang/qt/src/dn.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lang/qt/src/dn.cpp b/lang/qt/src/dn.cpp
-index f9fb2f6f..4310ad61 100644
---- a/lang/qt/src/dn.cpp
-+++ b/lang/qt/src/dn.cpp
-@@ -167,7 +167,7 @@ parse_dn_part(DnPair *array, const unsigned char *string)
-     for (unsigned int i = 0; i < numOidMaps; ++i)
-         if (!strcasecmp((char *)p, oidmap[i].oid)) {
-             free(p);
--            gpgrt_asprintf(&p, oidmap[i].name);
-+            gpgrt_asprintf(&p, "%s", oidmap[i].name);
-             break;
-         }
-     array->key = p;
--- 
-2.12.1
-

gpgme.spec

@@ -10,8 +10,8 @@
 
 Name:           gpgme
 Summary:        GnuPG Made Easy - high level crypto API
-Version:        1.9.0
-Release:        8%{?dist}
+Version:        1.10.0
+Release:        1%{?dist}
 
 License:        LGPLv2+
 URL:            https://gnupg.org/related_software/gpgme/
@@ -19,7 +19,6 @@ Source0:        ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2
 Source2:        gpgme-multilib.h
 
 ## upstream patches
-Patch0001:      0001-qt-pass-fmt-to-gpgrt_asprintf.patch
 
 ## downstream patches
 # Don't add extra libs/cflags in gpgme-config/cmake equivalent
@@ -237,6 +236,9 @@ fi
 %{python3_sitearch}/gpg/
 
 %changelog
+* Wed Dec 13 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.10.0-1
+- Update to 1.10.0
+
 * Tue Nov 07 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.9.0-8
 - Use better Obsoletes for platform-python
 

sources

@@ -1 +1 @@
-SHA512 (gpgme-1.9.0.tar.bz2) = 2a33343e907d9d70cc57dc1ef4e1c01995e1030bb0db937f44435643d6abfbb1bd55d52ba241701fa702783ebf035c09941131604fd8a811474b8bee41afccc8
+SHA512 (gpgme-1.10.0.tar.bz2) = 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5