Hello community, here is the log from the commit of package libqca2 for openSUSE:Factory checked in at 2015-12-27 01:57:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqca2 (Old) and /work/SRC/openSUSE:Factory/.libqca2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqca2" Changes: -------- --- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2015-12-13 09:37:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2015-12-27 01:57:45.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Dec 17 10:38:11 UTC 2015 - [email protected] + +- Pass all required switches to cmake to ensure it builds properly +- Install manpage to correct location + +------------------------------------------------------------------- +Thu Dec 17 10:12:46 UTC 2015 - [email protected] + +- Switch to bcond_with/without usage instead of 0/1 defines + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqca2.spec ++++++ --- /var/tmp/diff_new_pack.OXokyV/_old 2015-12-27 01:57:46.000000000 +0100 +++ /var/tmp/diff_new_pack.OXokyV/_new 2015-12-27 01:57:46.000000000 +0100 @@ -16,7 +16,18 @@ # +%bcond_with botan +%bcond_without nss +%bcond_without pkcs11 Name: libqca2 +Version: 2.1.1 +Release: 0 +Summary: Qt Cryptographic Architecture 2 +License: LGPL-2.1+ +Group: Development/Libraries/C and C++ +Url: https://projects.kde.org/projects/kdesupport/qca +Source: http://download.kde.org/stable/qca/%{version}/src/qca-%{version}.tar.xz +Source5: baselibs.conf BuildRequires: ca-certificates BuildRequires: cmake >= 2.8.12 BuildRequires: cyrus-sasl-devel @@ -29,29 +40,18 @@ BuildRequires: pkgconfig(QtCore) >= 4.7 BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libssl) -Summary: Qt Cryptographic Architecture 2 -License: LGPL-2.1+ -Group: Development/Libraries/C and C++ +Requires: gpg2 >= 2.0.0 +%requires_eq libqt4 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: https://projects.kde.org/projects/kdesupport/qca -Version: 2.1.1 -Release: 0 -%define with_botan 0 -%define with_nss 1 -%define with_pkcs11 1 -%if %with_botan +%if %{with botan} BuildRequires: pkgconfig(botan-1.10) %endif -%if %with_pkcs11 +%if %{with nss} BuildRequires: pkgconfig(nss) %endif -%if %with_pkcs11 +%if %{with pkcs11} BuildRequires: pkgconfig(libpkcs11-helper-1) %endif -Source: http://download.kde.org/stable/qca/%{version}/src/qca-%{version}.tar.xz -Source5: baselibs.conf -Requires: gpg2 >= 2.0.0 -%requires_eq libqt4 %description This package provides a generic Qt cryptographic architecture, @@ -87,7 +87,7 @@ It can be extended by further plug-ins, for example, with qca-sasl for SASL support. -%if %with_botan +%if %{with botan} %package plugin-botan Summary: Qt Cryptographic Architecture 2 Group: Development/Libraries/C and C++ @@ -104,7 +104,7 @@ SASL support. %endif -%if %with_nss +%if %{with nss} %package plugin-nss Summary: Qt Cryptographic Architecture 2 Group: Development/Libraries/C and C++ @@ -120,7 +120,7 @@ SASL support. %endif -%if %with_pkcs11 +%if %{with pkcs11} %package plugin-pkcs11 Summary: Qt Cryptographic Architecture 2 - pkcs11 support Group: Development/Libraries/C and C++ @@ -140,22 +140,34 @@ %setup -q -n qca-%{version} %build -cmake . +# TODO: When needed switch to Qt5 build +%cmake \ + -DQCA_PLUGINS_INSTALL_DIR=%{_libdir}/qt4/plugins/ \ + -DQCA_FEATURE_INSTALL_DIR=%{_datadir}/qt4/mkspecs/features/ \ + -DQT4_BUILD=ON \ + -DWITH_cyrus-sasl_PLUGIN=ON \ + -DWITH_gcrypt_PLUGIN=ON \ + -DWITH_gnupg_PLUGIN=ON \ + -DWITH_logger_PLUGIN=ON \ +%if %{with botan} + -DWITH_botan_PLUGIN=ON \ +%endif +%if %{with nss} + -DWITH_nss_PLUGIN=ON \ +%endif +%if %{with pkcs11} + -DWITH_pkcs11_PLUGIN=ON \ +%endif + -DWITH_ossl_PLUGIN=ON make %{?_smp_mflags} %install -make DESTDIR="%{buildroot}" install +%cmake_install %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%clean -# no baselibs supplements for older distros -%if %suse_version < 1110 - sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf -%endif - %files %defattr(-,root,root) %doc README COPYING TODO @@ -172,9 +184,7 @@ %{_bindir}/qcatool %{_includedir}/QtCrypto %{_datadir}/qt4/mkspecs/features/crypto.prf -%dir %{_datadir}/qt4/man/ -%dir %{_datadir}/qt4/man/man1/ -%{_datadir}/qt4/man/man1/qcatool.1 +%{_mandir}/man1/qcatool.1.* %{_libdir}/libqca.so %{_libdir}/pkgconfig/qca2.pc %{_libdir}/cmake/Qca/ @@ -183,19 +193,19 @@ %defattr(-,root,root) %{_libdir}/qt4/plugins/crypto/libqca-cyrus-sasl.so -%if %with_botan +%if %{with botan} %files plugin-botan %defattr(-,root,root) %{_libdir}/qt4/plugins/crypto/libqca-botan.so %endif -%if %with_nss +%if %{with nss} %files plugin-nss %defattr(-,root,root) %{_libdir}/qt4/plugins/crypto/libqca-nss.so %endif -%if %with_pkcs11 +%if %{with pkcs11} %files plugin-pkcs11 %defattr(-,root,root) %{_libdir}/qt4/plugins/crypto/libqca-pkcs11.so
