From 37812f6ffeaf6e3e70dab7585d365e5b190fb9565ffa72fc2e8d43a3234b3d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 17 Oct 2019 10:54:40 +0000 Subject: [PATCH 1/3] Accepting request 738939 from home:mgorse:branches:Base:System - Build qt bindings separately to avoid build cycle with samba/libsoup. OBS-URL: https://build.opensuse.org/request/show/738939 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=109 --- _multibuild | 3 +++ gpgme.changes | 6 ++++++ gpgme.spec | 52 ++++++++++++++++++++++++++++++++++----------------- 3 files changed, 44 insertions(+), 17 deletions(-) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..4f3bf01 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + +qt + diff --git a/gpgme.changes b/gpgme.changes index 941507c..64f4500 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 16 20:34:54 UTC 2019 - Michael Gorse + +- Build qt bindings separately to avoid build cycle with + samba/libsoup. + ------------------------------------------------------------------- Fri Jun 14 13:18:36 UTC 2019 - Pedro Monreal Gonzalez diff --git a/gpgme.spec b/gpgme.spec index b45e0d9..f0a399d 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -16,23 +16,31 @@ # -# Enable Qt bindings on TW and 42.3 (needed for KDE PIM) -%define with_qt 0%{?suse_version} >= 1330 || 0%{?sle_version} >= 120300 +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "" %bcond_without python2 %bcond_without python3 +%else +%bcond_with python2 +%bcond_with python3 +%endif +%if "%{flavor}" == "qt" +Name: libqgpgme +%else Name: gpgme +%endif Version: 1.13.1 Release: 0 Summary: Programmatic library interface to GnuPG License: LGPL-2.1-or-later AND GPL-3.0-or-later Group: Productivity/Security URL: http://www.gnupg.org/related_software/gpgme/ -Source: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2 -Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2.sig +Source: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2 +Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig Source2: baselibs.conf Source3: gpgme.keyring # used to have a fixed timestamp -Source99: %{name}.changes +Source99: gpgme.changes BuildRequires: gcc-c++ BuildRequires: gpg2 >= 2.0.10 BuildRequires: libassuan-devel >= 2.4.2 @@ -47,10 +55,10 @@ BuildRequires: python2-devel >= 2.7 %if %{with python3} BuildRequires: python3-devel >= 3.4 %endif -%if 0%{with_qt} +%if "%{flavor}" == "qt" BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Test) -%endif # with_qt +%endif # qt %description GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG @@ -174,7 +182,7 @@ management. This package contains the bindings to use the library in Qt C++ applications. %prep -%setup -q +%setup -q -n gpgme-%{version} %ifarch %{ix86} sed -i -e '/t-callbacks.py/d' lang/python/tests/Makefile.{am,in} @@ -188,9 +196,9 @@ languages="cl cpp" languages="${languages} python" %endif -%if 0%{?with_qt} -languages="${languages} qt" -%endif # with_qt +%if "%{flavor}" == "qt" +languages="cpp qt" +%endif # qt %configure \ --disable-silent-rules \ @@ -215,20 +223,29 @@ find %{buildroot}%{python3_sitearch}/gpg-*.egg-info -delete -print rm -vf %{buildroot}%{python3_sitelib}/gpg/install_files.txt find %{buildroot}%{python3_sitearch}/gpg -type f -name "*.pyc" -delete -print %endif +%if "%{flavor}" == "qt" +rm -r %{buildroot}%{_bindir} +rm -r %{buildroot}%{_datadir}/aclocal/gpgme* +rm -r %{buildroot}%{_includedir}/gpgme* +rm -r %{buildroot}%{_infodir}/gpgme* +rm -r %{buildroot}%{_libdir}/cmake/Gpgmepp +rm -r %{buildroot}%{_libdir}/libgpgme* +rm -r %{buildroot}%{_libdir}/pkgconfig/gpgme* +%endif %check %if ! 0%{?qemu_user_space_build} make %{?_smp_mflags} check %endif +%if "%{flavor}" == "qt" +%post -n libqgpgme7 -p /sbin/ldconfig +%postun -n libqgpgme7 -p /sbin/ldconfig +%else %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 0%{with_qt} -%post -n libqgpgme7 -p /sbin/ldconfig -%postun -n libqgpgme7 -p /sbin/ldconfig -%endif # with_qt %post %install_info --info-dir=%{_infodir} %{_infodir}/gpgme.info%{ext_info} @@ -275,8 +292,9 @@ make %{?_smp_mflags} check %files -n python3-gpg %{python3_sitearch}/gpg %endif +%endif # qt -%if 0%{with_qt} +%if "%{flavor}" == "qt" %files -n libqgpgme7 %{_libdir}/libqgpgme.so.* @@ -287,6 +305,6 @@ make %{?_smp_mflags} check %dir %{_libdir}/cmake/QGpgme %{_libdir}/cmake/QGpgme/*.cmake %{_libdir}/libqgpgme.so -%endif # with_qt +%endif # qt %changelog From b592cd6a39858fc42a2bbd42aaaf54680c98eb90c3ee06783313ee99ac0d8397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 17 Oct 2019 11:15:13 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=110 --- gpgme.spec | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/gpgme.spec b/gpgme.spec index f0a399d..05a11ed 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -20,15 +20,15 @@ %if "%{flavor}" == "" %bcond_without python2 %bcond_without python3 +%bcond_with qt +%define psuffix -qt %else %bcond_with python2 %bcond_with python3 +%bcond_without qt +%define psuffix %{nil} %endif -%if "%{flavor}" == "qt" -Name: libqgpgme -%else -Name: gpgme -%endif +Name: gpgme%{psuffix} Version: 1.13.1 Release: 0 Summary: Programmatic library interface to GnuPG @@ -55,10 +55,10 @@ BuildRequires: python2-devel >= 2.7 %if %{with python3} BuildRequires: python3-devel >= 3.4 %endif -%if "%{flavor}" == "qt" +%if %{with qt} BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Test) -%endif # qt +%endif %description GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG @@ -196,9 +196,9 @@ languages="cl cpp" languages="${languages} python" %endif -%if "%{flavor}" == "qt" +%if %{with qt} languages="cpp qt" -%endif # qt +%endif %configure \ --disable-silent-rules \ @@ -223,7 +223,7 @@ find %{buildroot}%{python3_sitearch}/gpg-*.egg-info -delete -print rm -vf %{buildroot}%{python3_sitelib}/gpg/install_files.txt find %{buildroot}%{python3_sitearch}/gpg -type f -name "*.pyc" -delete -print %endif -%if "%{flavor}" == "qt" +%if %{with qt} rm -r %{buildroot}%{_bindir} rm -r %{buildroot}%{_datadir}/aclocal/gpgme* rm -r %{buildroot}%{_includedir}/gpgme* @@ -238,10 +238,12 @@ rm -r %{buildroot}%{_libdir}/pkgconfig/gpgme* make %{?_smp_mflags} check %endif -%if "%{flavor}" == "qt" +%if %{with qt} %post -n libqgpgme7 -p /sbin/ldconfig %postun -n libqgpgme7 -p /sbin/ldconfig -%else +%endif + +%if !%{with qt} %post -n libgpgme11 -p /sbin/ldconfig %postun -n libgpgme11 -p /sbin/ldconfig %post -n libgpgmepp6 -p /sbin/ldconfig @@ -252,7 +254,9 @@ make %{?_smp_mflags} check %preun %install_info_delete --info-dir=%{_infodir} %{_infodir}/gpgme.info%{ext_info} +%endif +%if !%{with qt} %files %license COPYING COPYING.LESSER %doc AUTHORS ChangeLog ChangeLog-2011 README NEWS THANKS TODO VERSION @@ -282,6 +286,7 @@ make %{?_smp_mflags} check %dir %{_libdir}/cmake %dir %{_libdir}/cmake/Gpgmepp %{_libdir}/cmake/Gpgmepp/GpgmeppConfig*.cmake +%endif %if %{with python2} %files -n python2-gpg @@ -292,9 +297,8 @@ make %{?_smp_mflags} check %files -n python3-gpg %{python3_sitearch}/gpg %endif -%endif # qt -%if "%{flavor}" == "qt" +%if %{with qt} %files -n libqgpgme7 %{_libdir}/libqgpgme.so.* @@ -305,6 +309,6 @@ make %{?_smp_mflags} check %dir %{_libdir}/cmake/QGpgme %{_libdir}/cmake/QGpgme/*.cmake %{_libdir}/libqgpgme.so -%endif # qt +%endif %changelog From f35e64e0caded7e805c1eaf458ad6297f45d95a454e160ae1a47c3b8188cf64c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 17 Oct 2019 11:23:01 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=111 --- gpgme.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gpgme.spec b/gpgme.spec index 05a11ed..f42f9c5 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -21,12 +21,12 @@ %bcond_without python2 %bcond_without python3 %bcond_with qt -%define psuffix -qt +%define psuffix %{nil} %else %bcond_with python2 %bcond_with python3 %bcond_without qt -%define psuffix %{nil} +%define psuffix qt %endif Name: gpgme%{psuffix} Version: 1.13.1