From e28b23c70c95c134aee6d35426484669dd89fb07d78ff8457635bd6b74e724fb Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 8 Nov 2015 16:59:45 +0000 Subject: [PATCH 1/3] 5.16.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdesignerplugin?expand=0&rev=70 --- kdesignerplugin-5.15.0.tar.xz | 3 --- kdesignerplugin-5.16.0.tar.xz | 3 +++ kdesignerplugin.changes | 7 +++++++ kdesignerplugin.spec | 7 ++----- 4 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 kdesignerplugin-5.15.0.tar.xz create mode 100644 kdesignerplugin-5.16.0.tar.xz diff --git a/kdesignerplugin-5.15.0.tar.xz b/kdesignerplugin-5.15.0.tar.xz deleted file mode 100644 index f1dbde9..0000000 --- a/kdesignerplugin-5.15.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98b7a439eaa0cc0c969286d2adab1086b9d8950b562a6a7e31b389d31de8c657 -size 86956 diff --git a/kdesignerplugin-5.16.0.tar.xz b/kdesignerplugin-5.16.0.tar.xz new file mode 100644 index 0000000..a3b34a5 --- /dev/null +++ b/kdesignerplugin-5.16.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5a463a850c1830dbe92455b0595bad4797c434adb424e5a65d36f6fc16953f4 +size 87024 diff --git a/kdesignerplugin.changes b/kdesignerplugin.changes index f6586cd..646fe5e 100644 --- a/kdesignerplugin.changes +++ b/kdesignerplugin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Nov 8 16:59:42 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.16.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.16.0.php + ------------------------------------------------------------------- Thu Oct 8 14:30:46 UTC 2015 - alarrosa@suse.com diff --git a/kdesignerplugin.spec b/kdesignerplugin.spec index f2ca968..cb3a005 100644 --- a/kdesignerplugin.spec +++ b/kdesignerplugin.spec @@ -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 From 7b347883a1105926de6bcc103bc5a9e2c849da7b807fbd63e2a43c3f64296929 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 8 Nov 2015 17:05:09 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdesignerplugin?expand=0&rev=71 --- fix-build-with-cmake-less-than-3.0.0.diff | 13 ------------- kdesignerplugin.changes | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 fix-build-with-cmake-less-than-3.0.0.diff diff --git a/fix-build-with-cmake-less-than-3.0.0.diff b/fix-build-with-cmake-less-than-3.0.0.diff deleted file mode 100644 index 5054261..0000000 --- a/fix-build-with-cmake-less-than-3.0.0.diff +++ /dev/null @@ -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" diff --git a/kdesignerplugin.changes b/kdesignerplugin.changes index 646fe5e..8183282 100644 --- a/kdesignerplugin.changes +++ b/kdesignerplugin.changes @@ -4,6 +4,7 @@ Sun Nov 8 16:59:42 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.16.0 * 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 From 1a16738dd7868a5bef30bcb0c6b8ee0e024543788a072f1c379a6c1c2090896b Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 15 Nov 2015 16:14:18 +0000 Subject: [PATCH 3/3] changelogs OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdesignerplugin?expand=0&rev=72 --- kdesignerplugin.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kdesignerplugin.changes b/kdesignerplugin.changes index 8183282..b9166d8 100644 --- a/kdesignerplugin.changes +++ b/kdesignerplugin.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Sun Nov 8 16:59:42 UTC 2015 - hrvoje.senjan@gmail.com -- Update to 5.16.0 +- 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