From 286b6f9869b60f7b1bf7e210147e9347d6dfa7fcb637a99d87b0e98ab994d134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 14 Feb 2017 09:52:32 +0000 Subject: [PATCH] - Unconditionalize python and python3 builds - Unconditionalize c++ build OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=83 --- gpgme.changes | 6 +++++ gpgme.spec | 68 +++++++++++---------------------------------------- 2 files changed, 20 insertions(+), 54 deletions(-) diff --git a/gpgme.changes b/gpgme.changes index 6f1ec78..5c038d6 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 14 09:46:57 UTC 2017 - tchvatal@suse.com + +- Unconditionalize python and python3 builds +- Unconditionalize c++ build + ------------------------------------------------------------------- Mon Feb 13 18:39:46 UTC 2017 - jengelh@inai.de diff --git a/gpgme.spec b/gpgme.spec index 406cc31..875b094 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -16,9 +16,6 @@ # -%define with_cpp 1 -%define with_python2 1 -%define with_python3 0 %define with_qt 0%{?suse_version} >= 1330 Name: gpgme Version: 1.8.0 @@ -36,24 +33,17 @@ Source99: %{name}.changes #PATCH-FIX-UPSTREAM: remove-a-forgotten-instance-of-libsuffix.diff - Fix cmake files (or it will break KDE software building) Patch1: remove-a-forgotten-instance-of-libsuffix.diff Patch2: gpgme-include_functional.patch +BuildRequires: gcc-c++ BuildRequires: gpg2 >= 2.0.10 BuildRequires: libassuan-devel >= 2.0.2 BuildRequires: libgpg-error-devel >= 1.17 BuildRequires: pkgconfig +BuildRequires: python-devel >= 2.7 +BuildRequires: python3-devel >= 3.4 +BuildRequires: swig Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{with_python2} -BuildRequires: python-devel >= 2.7 -BuildRequires: swig -%endif # with_python2 -%if 0%{with_python3} -BuildRequires: python3-devel >= 3.4 -BuildRequires: swig -%endif # with_python3 -%if 0%{with_cpp} -BuildRequires: gcc-c++ -%endif # with_cpp %if 0%{with_qt} BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Test) @@ -95,7 +85,6 @@ management. This subpackage contains the headers needed for building applications making use of libgpgme. -%if 0%{with_cpp} %package -n libgpgmepp6 Summary: Programmatic C++ library interface to GnuPG Group: System/Libraries @@ -127,9 +116,6 @@ management. This subpackage contains the headers needed for building applications making use of libgpgmepp. -%endif # with_cpp - -%if 0%{with_python2} %package -n python-gpg Summary: Python 2 bindings for GPGME, a library for accessing GnuPG Group: Development/Languages/Python @@ -141,9 +127,7 @@ encryption, decryption, signing, signature verification, and key management. This package contains the bindings to use the library from Python 2 applications. -%endif # with_python2 -%if 0%{with_python3} %package -n python3-gpg Summary: Python 3 bindings for GPGME, a library for accessing GnuPG Group: Development/Languages/Python @@ -155,7 +139,6 @@ encryption, decryption, signing, signature verification, and key management. This package contains the bindings to use the library from Python 3 applications. -%endif # with_python3 %package -n libqgpgme7 Summary: Programmatic Qt library interface to GnuPG @@ -189,45 +172,33 @@ This package contains the bindings to use the library in Qt C++ applications. %setup -q %patch1 -p1 %patch2 -p1 + %build build_timestamp=$(date -u +%{Y}-%{m}-%{dT}%{H}:%{M}+0000 -r %{SOURCE99}) -languages="cl" -%if 0%{with_cpp} -languages="${languages} cpp" +languages="cl cpp python" %if %{with_qt} languages="${languages} qt" %endif # with_qt -%endif # with_cpp -%if 0%{with_python2} -languages="${languages} python2" -%endif # with_python2 -%if 0%{with_python3} -languages="${languages} python3" -%endif # with_python3 %configure \ + --disable-silent-rules \ --disable-static \ --disable-fd-passing \ --enable-languages="${languages}" \ --enable-build-timestamp="${build_timestamp}" - make %{?_smp_mflags} %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install find %{buildroot} -type f -name "*.la" -delete -print -%if 0%{with_cpp} chmod -x %{buildroot}%{_libdir}/cmake/Gpgmepp/*.cmake -%endif # with_cpp -%if 0%{with_python2} + find %{buildroot}%{python_sitearch}/gpg-*.egg-info -delete -print find %{buildroot}%{python_sitearch}/gpg -type f -name "*.pyc" -delete -print -rm -v %{buildroot}%{python_sitelib}/gpg/install_files.txt -%endif # with_python2 -%if 0%{with_python3} +rm -vf %{buildroot}%{python_sitelib}/gpg/install_files.txt + find %{buildroot}%{python3_sitearch}/gpg-*.egg-info -delete -print -rm -v %{buildroot}%{python3_sitelib}/gpg/install_files.txt +rm -vf %{buildroot}%{python3_sitelib}/gpg/install_files.txt find %{buildroot}%{python3_sitearch}/gpg -type f -name "*.pyc" -delete -print -%endif # with_python3 %check %if ! 0%{?qemu_user_space_build} @@ -236,21 +207,18 @@ make %{?_smp_mflags} check %post -n libgpgme11 -p /sbin/ldconfig %postun -n libgpgme11 -p /sbin/ldconfig -%if 0%{with_cpp} %post -n libgpgmepp6 -p /sbin/ldconfig %postun -n libgpgmepp6 -p /sbin/ldconfig -%endif # with_cpp - %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.gz +%install_info --info-dir=%{_infodir} %{_infodir}/gpgme.info%{ext_info} %preun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/gpgme.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/gpgme.info%{ext_info} %files %defattr(-,root,root) @@ -271,7 +239,6 @@ make %{?_smp_mflags} check %{_datadir}/aclocal/gpgme.m4 %{_includedir}/gpgme.h -%if 0%{with_cpp} %files -n libgpgmepp6 %defattr(-,root,root) %{_libdir}/libgpgmepp.so.* @@ -283,21 +250,14 @@ make %{?_smp_mflags} check %dir %{_libdir}/cmake %dir %{_libdir}/cmake/Gpgmepp %{_libdir}/cmake/Gpgmepp/GpgmeppConfig*.cmake -%endif # with_cpp -%if 0%{with_python2} %files -n python-gpg %defattr(-,root,root) -%{python_sitelib}/gpg %{python_sitearch}/gpg -%endif # with_python2 -%if 0%{with_python3} %files -n python3-gpg %defattr(-,root,root) -%{python3_sitelib}/gpg %{python3_sitearch}/gpg -%endif # with_python3 %if 0%{with_qt} %files -n libqgpgme7