diff --git a/qca-2.1.0-no_ansi.patch b/qca-2.1.0-no_ansi.patch new file mode 100644 index 0000000..8a3e9de --- /dev/null +++ b/qca-2.1.0-no_ansi.patch @@ -0,0 +1,14 @@ +diff -up qca-2.1.0/CMakeLists.txt.no_ansi qca-2.1.0/CMakeLists.txt +--- qca-2.1.0/CMakeLists.txt.no_ansi 2015-01-14 09:20:55.821300132 -0600 ++++ qca-2.1.0/CMakeLists.txt 2015-01-14 09:46:26.280035566 -0600 +@@ -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) + diff --git a/qca.spec b/qca.spec index ebfdf53..686ebaa 100644 --- a/qca.spec +++ b/qca.spec @@ -5,7 +5,7 @@ Name: qca Summary: Qt Cryptographic Architecture Version: 2.1.0 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ URL: http://delta.affinix.com/qca @@ -36,8 +36,13 @@ Patch20: 0020-put-headers-of-a-suffixed-build-in-a-suffixed-direct.patch Patch21: 0021-properly-support-co-existing-qt4-and-qt5-versions.patch Patch22: 0022-initialize-QCA_SUFFIX-cache-with-the-possibly-previo.patch +## fedora patches +# workaround gcrypt.h header fail with -ansi flag +# https://bugzilla.redhat.com/show_bug.cgi?id=1182200 +Patch100: qca-2.1.0-no_ansi.patch + + BuildRequires: cmake >= 2.8.12 -BuildRequires: doxygen BuildRequires: libgcrypt-devel BuildRequires: pkgconfig(botan-1.10) BuildRequires: pkgconfig(libcrypto) pkgconfig(libssl) @@ -45,6 +50,11 @@ BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(libpkcs11-helper-1) BuildRequires: pkgconfig(libsasl2) BuildRequires: pkgconfig(QtCore) +# apidocs +# may need to add some tex-related ones too -- rex +BuildRequires: doxygen +BuildRequires: graphviz + # qca2 renamed qca Obsoletes: qca2 < 2.1.0 @@ -269,7 +279,6 @@ make test ARGS="--timeout 300 --output-on-failure" -C %{_target_platform} make test ARGS="--timeout 300 --output-on-failure" -C %{_target_platform}-qt5 %endif - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -381,6 +390,10 @@ make test ARGS="--timeout 300 --output-on-failure" -C %{_target_platform}-qt5 %changelog +* Wed Jan 14 2015 Rex Dieter 2.1.0-8 +- workaround -gcrypt ftbfs (#1182200) +- BR: graphviz (docs use 'dot' apparently) + * Tue Jan 13 2015 Rex Dieter 2.1.0-7 - more upstream fixes (qt5 branch too)