Hello community, here is the log from the commit of package libqca-qt5 for openSUSE:Factory checked in at 2015-02-16 22:12:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqca-qt5 (Old) and /work/SRC/openSUSE:Factory/.libqca-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqca-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/libqca-qt5/libqca-qt5.changes 2014-11-14 09:18:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqca-qt5.new/libqca-qt5.changes 2015-02-16 22:12:05.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Jan 10 06:58:34 UTC 2015 - [email protected] + +- Update to 2.1.0.3 + * Allow co-installability with Qt4 build +- Remove conflict with libqca2-devel +- Bump required cmake version to 2.8.12 +- Added ansi.diff, rh#1182200 +- Added 0001-Add-missing-QIODevice-include.patch, fixes build with + Qt 5.5 + +------------------------------------------------------------------- Old: ---- qca-2.1.0.tar.gz New: ---- 0001-Add-missing-QIODevice-include.patch ansi.diff qca-qt5-2.1.0.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqca-qt5.spec ++++++ --- /var/tmp/diff_new_pack.ICBQ9p/_old 2015-02-16 22:12:06.000000000 +0100 +++ /var/tmp/diff_new_pack.ICBQ9p/_new 2015-02-16 22:12:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqca-qt5 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -18,17 +18,21 @@ %define _so 2 Name: libqca-qt5 -Version: 2.1.0 +Version: 2.1.0.3 Release: 0 Summary: Qt Cryptographic Architecture 2 License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://delta.affinix.com/qca/ -Source: http://delta.affinix.com/download/qca/2.0/qca-%{version}.tar.gz +Source: http://download.kde.org/stable/qca-qt5/%{version}/src/qca-qt5-%{version}.tar.xz Source1: baselibs.conf Source99: libqca-qt5-rpmlintrc +# PATCH-FIX-OPENSUSE ansi.diff -- rh#1182200. drop ansi flags in order to compile with latest gcrypt +Patch0: ansi.diff +# PATCH-FIX-UPSTREAM 0001-Add-missing-QIODevice-include.patch -- Fix build with Qt 5.5 +Patch1: 0001-Add-missing-QIODevice-include.patch BuildRequires: ca-certificates -BuildRequires: cmake +BuildRequires: cmake >= 2.8.12 BuildRequires: cyrus-sasl-devel BuildRequires: gpg2 BuildRequires: libbotan-devel @@ -62,7 +66,6 @@ Requires: %{name} = %{version} Requires: pkgconfig(Qt5Core) >= 5.2.0 Requires: pkgconfig(Qt5Network) >= 5.2.0 -Conflicts: libqca2-devel %description devel This package provides a generic Qt cryptographic architecture, @@ -83,7 +86,9 @@ SASL support. %prep -%setup -q -n qca-%{version} +%setup -q -n qca-qt5-%{version} +%patch0 -p1 +%patch1 -p1 %build %cmake \ @@ -112,17 +117,18 @@ %{_libdir}/qt5/plugins/crypto/libqca-softstore.so %{_libdir}/qt5/plugins/crypto/libqca-ossl.so %{_libdir}/qt5/plugins/crypto/libqca-gnupg.so +%{_libdir}/qt5/plugins/crypto/libqca-gcrypt.so %files devel %defattr(-,root,root) %{_bindir}/qcatool-qt5 %{_bindir}/mozcerts-qt5 -%{_includedir}/qt5/QtCrypto +%{_includedir}/qt5/Qca-qt5/ %{_libdir}/qt5/mkspecs/features/crypto.prf %{_mandir}/man1/qcatool-qt5* %{_libdir}/libqca-qt5.so %{_libdir}/pkgconfig/qca2-qt5.pc -%{_libdir}/cmake/Qca/ +%{_libdir}/cmake/Qca-qt5/ %files plugins %defattr(-,root,root) ++++++ 0001-Add-missing-QIODevice-include.patch ++++++ >From 7207e6285e932044cd66d49d0dc484666cfb0092 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan <[email protected]> Date: Sat, 17 Jan 2015 20:12:18 +0100 Subject: [PATCH 1/1] Add missing QIODevice include Fixes build with Qt 5.5 --- include/QtCrypto/qca_basic.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/QtCrypto/qca_basic.h b/include/QtCrypto/qca_basic.h index 42808c55846791a611b9da8e634c1b90027b9764..e0c6cbbf09e4a1cb586534a65176d45ed01c45a7 100644 --- a/include/QtCrypto/qca_basic.h +++ b/include/QtCrypto/qca_basic.h @@ -35,6 +35,8 @@ #include "qca_core.h" +#include <QIODevice> + // Qt5 comes with QStringLiteral for wrapping string literals, which Qt4 does // not have. It is needed if the headers are built with QT_NO_CAST_FROM_ASCII. // Defining it here as QString::fromUtf8 for convenience. -- 2.2.2 ++++++ ansi.diff ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f47d3d..40cd289 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,8 +122,8 @@ if (CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align") endif() - set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") - set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common") + set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -Wundef -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common") endif (CMAKE_SYSTEM_NAME MATCHES Linux) endif (CMAKE_COMPILER_IS_GNUCXX) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.ICBQ9p/_old 2015-02-16 22:12:06.000000000 +0100 +++ /var/tmp/diff_new_pack.ICBQ9p/_new 2015-02-16 22:12:06.000000000 +0100 @@ -1,3 +1,5 @@ libqca-qt5 + recommends "libqca-qt5-plugins-<targettype> = <version>" +libqca-qt5-plugins libqca-qt5-devel requires "libqca-qt5-<targettype> = <version>" \ No newline at end of file -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
