Hello community, here is the log from the commit of package libqca-qt5 for openSUSE:Factory checked in at 2017-09-08 20:43:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqca-qt5 (Old) and /work/SRC/openSUSE:Factory/.libqca-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqca-qt5" Fri Sep 8 20:43:18 2017 rev:5 rq:519816 version:2.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libqca-qt5/libqca-qt5.changes 2016-05-31 12:11:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqca-qt5.new/libqca-qt5.changes 2017-09-08 20:43:21.411513729 +0200 @@ -1,0 +2,6 @@ +Fri Aug 25 08:52:31 UTC 2017 - [email protected] + +- Force building against openSSL 1.0 (boo#1055310) +- Disable PKCS11 on TW to avoid openssl conflicts + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqca-qt5.spec ++++++ --- /var/tmp/diff_new_pack.Jd3LqQ/_old 2017-09-08 20:43:22.155409136 +0200 +++ /var/tmp/diff_new_pack.Jd3LqQ/_new 2017-09-08 20:43:22.159408574 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqca-qt5 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,13 @@ # +%if 0%{?suse_version} > 1320 +# Disable PKCS11 on TW, conflicts with older openssl +%bcond_with pkcs11 +%else +%bcond_without pkcs11 +%endif + %define _so 2 Name: libqca-qt5 Version: 2.1.1 @@ -40,8 +47,14 @@ BuildRequires: libgcrypt-devel BuildRequires: libjpeg-devel BuildRequires: mozilla-nss-devel +%if 0%{?suse_version} >= 1330 +BuildRequires: libopenssl-1_0_0-devel +%else BuildRequires: openssl-devel +%endif +%if %{with pkcs11} BuildRequires: pkcs11-helper-devel +%endif BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5Network) >= 5.2.0 @@ -73,7 +86,7 @@ of openssl, like SSL/TLS, X509, RSA, SHA1, MD5, Blowfish, 3DES and AES. %package plugins -Summary: Qt Cryptographic Architecture 2 - pkcs11 support +Summary: Qt Cryptographic Architecture 2 - Various plugins Group: Development/Libraries/C and C++ %description plugins @@ -134,6 +147,8 @@ %defattr(-,root,root) %{_libdir}/qt5/plugins/crypto/libqca-cyrus-sasl.so %{_libdir}/qt5/plugins/crypto/libqca-nss.so +%if %{with pkcs11} %{_libdir}/qt5/plugins/crypto/libqca-pkcs11.so +%endif %changelog
