diff --git a/fix-build-with-cmake-less-than-3.0.0.diff b/fix-build-with-cmake-less-than-3.0.0.diff new file mode 100644 index 0000000..5054261 --- /dev/null +++ b/fix-build-with-cmake-less-than-3.0.0.diff @@ -0,0 +1,13 @@ +Index: kdesignerplugin-5.15.0/KF5DesignerPluginMacros.cmake +=================================================================== +--- kdesignerplugin-5.15.0.orig/KF5DesignerPluginMacros.cmake ++++ kdesignerplugin-5.15.0/KF5DesignerPluginMacros.cmake +@@ -87,7 +87,7 @@ macro(kf5designerplugin_add_plugin targe + PURPOSE "Required to build Qt Designer plugins" + ) + endif() +- if(NOT Qt5Designer_VERSION_STRING VERSION_LESS 5.5.0 AND NOT Qt5UiPlugin_FOUND) ++ if(NOT Qt5Designer_VERSION_STRING VERSION_LESS 5.5.0 AND NOT Qt5UiPlugin_FOUND AND NOT CMAKE_VERSION VERSION_LESS 3.0.0) + find_package(Qt5UiPlugin ${REQUIRED_QT_VERSION} ${_requiredarg} NO_MODULE) + set_package_properties(Qt5UiPlugin PROPERTIES + PURPOSE "Required to build Qt Designer plugins" diff --git a/kdesignerplugin.changes b/kdesignerplugin.changes index f8b4031..a7bee2a 100644 --- a/kdesignerplugin.changes +++ b/kdesignerplugin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 8 14:30:46 UTC 2015 - alarrosa@suse.com + +- Added fix-build-with-cmake-less-than-3.0.0.diff to not include + Qt5UiPlugin module if we don't have cmake 3.0.0 since that module + requires it + ------------------------------------------------------------------- Mon Oct 5 17:37:11 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kdesignerplugin.spec b/kdesignerplugin.spec index bc79345..f2ca968 100644 --- a/kdesignerplugin.spec +++ b/kdesignerplugin.spec @@ -55,6 +55,8 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz +# PATCH-FIX_OPENSUSE fix-build-with-cmake-less-than-3.0.0.diff alarrosa@suse.com -- Don't include cmake files that depend on newer cmake versions +Patch0: fix-build-with-cmake-less-than-3.0.0.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -79,6 +81,7 @@ from ini-style description files. Development files. %lang_package %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build