diff --git a/quassel-set-required-libs-and-flags.patch b/quassel-set-required-libs-and-flags.patch new file mode 100644 index 0000000..961eaa3 --- /dev/null +++ b/quassel-set-required-libs-and-flags.patch @@ -0,0 +1,13 @@ +Index: quassel-0.12.2/CMakeLists.txt +=================================================================== +--- quassel-0.12.2.orig/CMakeLists.txt ++++ quassel-0.12.2/CMakeLists.txt +@@ -484,6 +484,8 @@ endif() + # a small test program checking the defines. This works for both Qt4 and Qt5. + cmake_push_check_state(RESET) + set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS}) ++set(CMAKE_REQUIRED_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}) ++set(CMAKE_REQUIRED_LIBRARIES ${Qt5Core_LIBRARIES}) + check_cxx_source_compiles(" + #include \"qglobal.h\" + #if defined QT_NO_OPENSSL || defined QT_NO_SSL diff --git a/quassel.changes b/quassel.changes index 4068712..fab5680 100644 --- a/quassel.changes +++ b/quassel.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Jul 4 21:46:31 UTC 2015 - hrvoje.senjan@gmail.com + +- Add quassel-set-required-libs-and-flags.patch: Set the correct + libraries and compiler flags in order to use qglobal.h in + check_cxx_source_compiles function +- Drop quassel-disable-ssl-check.patch + +------------------------------------------------------------------- +Fri Jul 3 06:25:25 UTC 2015 - tchvatal@suse.com + +- Add patch to fix/disable SSL check in cmakelists.txt: + * quassel-disable-ssl-check.patch + ------------------------------------------------------------------- Wed May 6 13:00:35 UTC 2015 - tittiatcoke@gmail.com diff --git a/quassel.spec b/quassel.spec index 21656d7..05573ab 100644 --- a/quassel.spec +++ b/quassel.spec @@ -29,6 +29,8 @@ Source2: sysconfig.%{name}core Source3: logrotate.%{name}core Source4: %{name}.SuSEfirewall2 Source5: quassel-rpmlintrc +# PATCH-FIX-SUSE: Set the correct libraries and compiler flags in order to use qglobal.h in check_cxx_source_compiles function +Patch0: quassel-set-required-libs-and-flags.patch BuildRequires: cmake >= 2.8.10 BuildRequires: extra-cmake-modules BuildRequires: fdupes @@ -154,6 +156,7 @@ This contains common parts shared by %{name} and %{name}-client %prep %setup -q +%patch0 -p1 %build FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')