Accepting request 436111 from home:luca_b:branches:Base:System

- New upstream release 1.7.1
  * Fixed problems with the new language bindings.
  * New helper function gpgme_addrspec_from_uid.
  * Use option --exit-on-status-write-error with newer gpg versions.
  * qt: Missed API from the Qt Binding inclusion has
    been added again.
  * qt: abstractimportjob.h is now installed to that
    ImportJobs can be used again.
  * qt: Fixed spelling error in API (startReceive).
  * Interface changes relative to the 1.7.0 release:
    gpgme_addrspec_from_uid         NEW.
    qt: WksPublishJob::startRecieve RENAMED to ::startReceive.
    qt: MultiDeleteJob              NEW.
    qt: AbstractImportJob           NEW.
    qt: SpecialJob                  NEW.
    cpp: Signature::key(bool, bool)              NEW.
    cpp: UserID::addrSpecFromString(const char*) NEW.
    cpp: UserID::addrSpec()                      NEW.
- Drop conflict (handled on kdepimlibs4 side)
- Drop upstreamed patches:
  * gpgme-1.7.0-nonvoid-returns.patch
  * gpgme-1.7.0-cpp-qt-Include-config.h.patch
  * gpgme-1.7.0-python-Include-config.h.patch

OBS-URL: https://build.opensuse.org/request/show/436111
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=71

gpgme.spec

@@ -21,7 +21,7 @@
 %define with_python3 0
 %define with_qt 1
 Name:           gpgme
-Version:        1.7.0
+Version:        1.7.1
 Release:        0
 Summary:        A Library Designed to Give Applications Easy Access to GnuPG
 License:        LGPL-2.1+ and GPL-3.0+
@@ -33,9 +33,6 @@ Source2:        baselibs.conf
 Source3:        gpgme.keyring
 # used to have a fixed timestamp
 Source99:       %{name}.changes
-Patch0:         gpgme-1.7.0-nonvoid-returns.patch
-Patch1:         gpgme-1.7.0-cpp-qt-Include-config.h.patch
-Patch2:         gpgme-1.7.0-python-Include-config.h.patch
 # for gpgme-1.7.0-python-Include-config.h.patch
 BuildRequires:  automake >= 1.14
 #
@@ -154,9 +151,6 @@ Requires:       glibc-devel
 Requires:       libgpg-error-devel
 Requires:       libgpgme-devel = %{version}
 Requires:       libgpgmepp6 = %{version}
-# GPGME++ originated from kdepimlibs, then became independent
-# It's impossible to build kdepimlibs4 with GpGME++ 1.7: therefore, conflict.
-Conflicts:      kdepimlibs4-devel
 %requires_ge	libassuan-devel
 
 %description -n libgpgmepp-devel
@@ -228,12 +222,12 @@ This package contains the bindings to use the library from Python 3 applications
 %endif # with_python3
 
 %if 0%{with_qt}
-%package -n libqgpgme6
+%package -n libqgpgme7
 Summary:        A Library Designed to give Qt Applications easy Access to GnuPG
 Group:          Development/Libraries/C and C++
 Requires:       gpg2
 
-%description -n libqgpgme6
+%description -n libqgpgme7
 GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
 easier for applications. It provides a high-level Crypto API for
 encryption, decryption, signing, signature verification, and key
@@ -256,7 +250,7 @@ Summary:        A Library Designed to give C++ Qt Applications easy Access to Gn
 Group:          Development/Libraries/C and C++
 Requires:       libgpgme-devel = %{version}
 Requires:       libgpgmepp-devel = %{version}
-Requires:       libqgpgme6 = %{version}
+Requires:       libqgpgme7 = %{version}
 
 %description -n libqgpgme-devel
 GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
@@ -280,9 +274,6 @@ This package contains the bindings to use the library in Qt C++ applications.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 # for gpgme-1.7.0-python-Include-config.h.patch
@@ -340,8 +331,8 @@ make %{?_smp_mflags} check
 %endif # with_cpp
 
 %if 0%{with_qt}
-%post -n libqgpgme6 -p /sbin/ldconfig
-%postun -n libqgpgme6 -p /sbin/ldconfig
+%post -n libqgpgme7 -p /sbin/ldconfig
+%postun -n libqgpgme7 -p /sbin/ldconfig
 %endif # with_qt
 
 %post
@@ -401,7 +392,7 @@ make %{?_smp_mflags} check
 %endif # with_python3
 
 %if 0%{with_qt}
-%files -n libqgpgme6
+%files -n libqgpgme7
 %defattr(-,root,root)
 %{_libdir}/libqgpgme.so.*