Accepting request 344512 from KDE:Frameworks5

Update to 5.16.0

OBS-URL: https://build.opensuse.org/request/show/344512
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdesignerplugin?expand=0&rev=23
This commit is contained in:
Stephan Kulow 2015-11-24 21:22:59 +00:00 committed by Git OBS Bridge
commit 902f03e716
5 changed files with 14 additions and 21 deletions

View File

@ -1,13 +0,0 @@
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"

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:98b7a439eaa0cc0c969286d2adab1086b9d8950b562a6a7e31b389d31de8c657
size 86956

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c5a463a850c1830dbe92455b0595bad4797c434adb424e5a65d36f6fc16953f4
size 87024

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sun Nov 8 16:59:42 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.16.0 (boo#955067)
* Add KCollapsibleGroupBox
* For more details please see:
https://www.kde.org/announcements/kde-frameworks-5.16.0.php
- Drop fix-build-with-cmake-less-than-3.0.0.diff, upstreamed
-------------------------------------------------------------------
Thu Oct 8 14:30:46 UTC 2015 - alarrosa@suse.com

View File

@ -17,9 +17,9 @@
%bcond_without lang
%define _tar_path 5.15
%define _tar_path 5.16
Name: kdesignerplugin
Version: 5.15.0
Version: 5.16.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
@ -55,8 +55,6 @@ 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
@ -81,7 +79,6 @@ from ini-style description files. Development files.
%lang_package
%prep
%setup -q
%patch0 -p1
%build
%cmake_kf5 -d build