Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gpgme for openSUSE:Factory checked
in at 2023-04-16 19:13:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gpgme (Old)
and /work/SRC/openSUSE:Factory/.gpgme.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpgme"
Sun Apr 16 19:13:00 2023 rev:95 rq:1079638 version:1.19.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gpgme/gpgme.changes 2023-03-24
15:15:56.361471389 +0100
+++ /work/SRC/openSUSE:Factory/.gpgme.new.19717/gpgme.changes 2023-04-16
19:13:19.001425757 +0200
@@ -1,0 +2,6 @@
+Tue Apr 11 22:15:02 UTC 2023 - Christophe Marin <christo...@krop.fr>
+
+- Add a Qt6 flavor to build Qt6 bindings
+- Use %ldconfig_scriptlets
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gpgme.spec ++++++
--- /var/tmp/diff_new_pack.IAJlFY/_old 2023-04-16 19:13:19.425428207 +0200
+++ /var/tmp/diff_new_pack.IAJlFY/_new 2023-04-16 19:13:19.429428229 +0200
@@ -21,11 +21,17 @@
%define psuffix %{nil}
%bcond_without python3
%bcond_with qt
-%else
+%endif
+%if "%{flavor}" == "qt"
%define psuffix qt
%bcond_with python3
%bcond_without qt
%endif
+%if "%{flavor}" == "qt6"
+%define psuffix qt6
+%bcond_with python3
+%bcond_without qt6
+%endif
Name: gpgme%{psuffix}
Version: 1.19.0
Release: 0
@@ -60,6 +66,10 @@
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Test)
%endif
+%if %{with qt6}
+BuildRequires: pkgconfig(Qt6Core) >= 6.4.0
+BuildRequires: pkgconfig(Qt6Test)
+%endif
%if 0%{?suse_version} >= 1550
# TW: generate subpackages for every python3 flavor
%define python_subpackage_only 1
@@ -166,7 +176,7 @@
%endif
%package -n libqgpgme15
-Summary: Programmatic Qt library interface to GnuPG
+Summary: Programmatic Qt 5 library interface to GnuPG
Group: System/Libraries
Requires: gpg2
@@ -176,10 +186,10 @@
encryption, decryption, signing, signature verification, and key
management.
-This package contains the Qt bindings.
+This package contains the Qt 5 bindings.
%package -n libqgpgme-devel
-Summary: Development files for libqgpgme, a Qt library for accessing
GnuPG
+Summary: Development files for libqgpgme, a Qt 5 library for accessing
GnuPG
Group: Development/Libraries/C and C++
Requires: libgpgme-devel = %{version}
Requires: libgpgmepp-devel = %{version}
@@ -191,7 +201,37 @@
encryption, decryption, signing, signature verification, and key
management.
-This package contains the bindings to use the library in Qt C++ applications.
+This package contains the bindings to use the library in Qt 5 C++ applications.
+
+%package -n libqgpgmeqt6-15
+Summary: Programmatic Qt 6 library interface to GnuPG
+Group: System/Libraries
+Requires: gpg2
+
+%description -n libqgpgmeqt6-15
+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
+management.
+
+This package contains the Qt 6 bindings.
+
+%package -n libqgpgmeqt6-devel
+Summary: Development files for libqgpgmeqt6, a Qt library for accessing
GnuPG
+Group: Development/Libraries/C and C++
+Requires: libgpgme-devel = %{version}
+Requires: libgpgmepp-devel = %{version}
+Requires: libqgpgmeqt6-15 = %{version}
+# The include folders have the same name in both libqgpgme-devel and
libqgpgmeqt6-devel
+Conflicts: libqgpgme-devel
+
+%description -n libqgpgmeqt6-devel
+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
+management.
+
+This package contains the bindings to use the library in Qt 6 C++ applications.
%prep
%autosetup -p1 -n gpgme-%{version}
@@ -209,6 +249,10 @@
languages="cpp qt"
%endif
+%if %{with qt6}
+languages="cpp qt6"
+%endif
+
%configure \
--disable-silent-rules \
--disable-static \
@@ -222,7 +266,7 @@
find %{buildroot} -type f -name "*.la" -delete -print
chmod -x %{buildroot}%{_libdir}/cmake/Gpgmepp/*.cmake
-%if %{with qt}
+%if %{with qt} || %{with qt6}
rm -r %{buildroot}%{_bindir}
rm -r %{buildroot}%{_datadir}/aclocal/gpgme*
rm -r %{buildroot}%{_includedir}/gpgme*
@@ -238,18 +282,19 @@
%endif
%if %{with qt}
-%post -n libqgpgme15 -p /sbin/ldconfig
-%postun -n libqgpgme15 -p /sbin/ldconfig
+%ldconfig_scriptlets -n libqgpgme15
+%endif
+
+%if %{with qt6}
+%ldconfig_scriptlets -n libqgpgmeqt6-15
%endif
-%if !%{with qt}
-%post -n libgpgme11 -p /sbin/ldconfig
-%postun -n libgpgme11 -p /sbin/ldconfig
-%post -n libgpgmepp6 -p /sbin/ldconfig
-%postun -n libgpgmepp6 -p /sbin/ldconfig
+%if !%{with qt} && !%{with qt6}
+%ldconfig_scriptlets -n libgpgme11
+%ldconfig_scriptlets -n libgpgmepp6
%endif
-%if !%{with qt}
+%if !%{with qt} && !%{with qt6}
%files
%license COPYING COPYING.LESSER LICENSES
%doc AUTHORS ChangeLog ChangeLog-2011 README NEWS THANKS TODO VERSION
@@ -307,4 +352,19 @@
%{_libdir}/libqgpgme.so
%endif
+%if %{with qt6}
+%files -n libqgpgmeqt6-15
+%license COPYING COPYING.LESSER LICENSES
+%{_libdir}/libqgpgmeqt6.so.*
+
+%files -n libqgpgmeqt6-devel
+%license COPYING COPYING.LESSER LICENSES
+%{_includedir}/qgpgme/
+%{_includedir}/QGpgME/
+%dir %{_libdir}/cmake
+%dir %{_libdir}/cmake/QGpgmeQt6
+%{_libdir}/cmake/QGpgmeQt6/*.cmake
+%{_libdir}/libqgpgmeqt6.so
+%endif
+
%changelog
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.IAJlFY/_old 2023-04-16 19:13:19.465428437 +0200
+++ /var/tmp/diff_new_pack.IAJlFY/_new 2023-04-16 19:13:19.469428461 +0200
@@ -1,4 +1,5 @@
<multibuild>
<package>qt</package>
+<package>qt6</package>
</multibuild>
