Accepting request 295608 from KDE:Frameworks5

Update to 5.9.0

OBS-URL: https://build.opensuse.org/request/show/295608
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kcmutils?expand=0&rev=15

kcmutils-5.8.0.tar.xz

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

kcmutils-5.9.0.tar.xz

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

kcmutils-use-susehelp.patch

@@ -0,0 +1,13 @@
+diff --git a/src/kcmultidialog.cpp b/src/kcmultidialog.cpp
+index 6dbfa33..c68b12f 100644
+--- a/src/kcmultidialog.cpp
++++ b/src/kcmultidialog.cpp
+@@ -377,7 +377,7 @@ void KCMultiDialog::slotHelpClicked()
+ 
+     QUrl docUrl = QUrl(QStringLiteral("help:/")).resolved(QUrl(docPath)); // same code as in KHelpClient::invokeHelp
+     if (docUrl.scheme() == QLatin1String("help") || docUrl.scheme() == QLatin1String("man") || docUrl.scheme() == QLatin1String("info")) {
+-        QProcess::startDetached(QStringLiteral("khelpcenter"), QStringList() << docUrl.toString());
++        QProcess::startDetached(QStringLiteral("susehelp"), QStringList() << docUrl.toString());
+     } else {
+         QDesktopServices::openUrl(docUrl);
+     }

kcmutils.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sat Apr  4 14:41:04 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.9.0
+  * Use new json-based plugin system. KCMs are searched under kcms/.
+  For now a desktop file still needs to be installed under
+  kservices5/ for compatibility
+  * Load and wrap the QML-only version of kcms if possible
+  * For more details please see:
+    https://www.kde.org/announcements/kde-frameworks-5.9.0.php
+- Added new BuildRequires: kpackage-devel, kdeclarative-devel,
+  pkgconfig(Qt5Qml) and pkgconfig(Qt5Quick)
+- Drop no longer needed Requires of the devel subpackage:
+  kiconthemes-devel, kitemviews-devel and kxmlgui-devel
+- Added kcmutils-use-susehelp.patch: Use susehelp wrapper, instead
+  of khelpcenter command (we use khelpcenter5)
+
 -------------------------------------------------------------------
 Sat Mar  7 16:59:02 UTC 2015 - hrvoje.senjan@gmail.com
 

kcmutils.spec

@@ -16,24 +16,29 @@
 #
 
 
+%bcond_without lang
 %define lname   libKF5KCMUtils5
-%define _tar_path 5.8
+%define _tar_path 5.9
 Name:           kcmutils
-Version:        %{_tar_path}.0
+Version:        5.9.0
 Release:        0
 %define kf5_version %{version}
 BuildRequires:  cmake >= 2.8.12
-BuildRequires:  extra-cmake-modules >= 1.8.0
+BuildRequires:  extra-cmake-modules >= %{_tar_path}
 BuildRequires:  fdupes
-BuildRequires:  kconfigwidgets-devel >= %{kf5_version}
+BuildRequires:  kconfigwidgets-devel >= %{_tar_path}
-BuildRequires:  kcoreaddons-devel >= %{kf5_version}
+BuildRequires:  kcoreaddons-devel >= %{_tar_path}
+BuildRequires:  kdeclarative-devel >= %{_tar_path}
 BuildRequires:  kf5-filesystem
-BuildRequires:  ki18n-devel >= %{kf5_version}
+BuildRequires:  ki18n-devel >= %{_tar_path}
-BuildRequires:  kiconthemes-devel >= %{kf5_version}
+BuildRequires:  kiconthemes-devel >= %{_tar_path}
-BuildRequires:  kitemviews-devel >= %{kf5_version}
+BuildRequires:  kitemviews-devel >= %{_tar_path}
-BuildRequires:  kservice-devel >= %{kf5_version}
+BuildRequires:  kpackage-devel >= %{_tar_path}
-BuildRequires:  kxmlgui-devel >= %{kf5_version}
+BuildRequires:  kservice-devel >= %{_tar_path}
+BuildRequires:  kxmlgui-devel >= %{_tar_path}
 BuildRequires:  pkgconfig(Qt5DBus) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5Qml) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5Quick) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Widgets) >= 5.2.0
 Summary:        Provides various classes to work with KCModules
 License:        LGPL-2.1+
@@ -41,6 +46,8 @@ Group:          System/GUI/KDE
 Url:            http://www.kde.org
 Source:         http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
+# PATCH-FIX-OPENSUSE kcmutils-use-susehelp.patch -- Use susehelp wrapper, instead of khelpcenter command (we use khelpcenter5)
+Patch0:         kcmutils-use-susehelp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -51,7 +58,9 @@ created with the KConfigWidgets framework.
 Summary:        Provides various classes to work with KCModules
 Group:          System/GUI/KDE
 Obsoletes:      libKF5KCMUtils4
+%if %{with lang}
 Recommends:     %lname-lang = %{version}
+%endif
 
 %description -n %lname
 KCMUtils provides various classes to work with KCModules. KCModules can be
@@ -62,11 +71,8 @@ Summary:        Provides various classes to work with KCModules: Build Environme
 Group:          Development/Libraries/KDE
 Requires:       %lname = %{version}
 Requires:       extra-cmake-modules
-Requires:       kconfigwidgets-devel >= %{kf5_version}
+Requires:       kconfigwidgets-devel >= %{_tar_path}
-Requires:       kiconthemes-devel >= %{kf5_version}
+Requires:       kservice-devel >= %{_tar_path}
-Requires:       kitemviews-devel >= %{kf5_version}
-Requires:       kservice-devel >= %{kf5_version}
-Requires:       kxmlgui-devel >= %{kf5_version}
 
 %description devel
 KCMUtils provides various classes to work with KCModules. KCModules can be
@@ -75,6 +81,7 @@ created with the KConfigWidgets framework. Development files.
 %lang_package -n %lname
 %prep
 %setup -q
+%patch0 -p1
 
 %build
   %cmake_kf5 -d build
@@ -82,15 +89,19 @@ created with the KConfigWidgets framework. Development files.
 
 %install
   %kf5_makeinstall -C build
-  %fdupes -s %{buildroot}
+  %fdupes %{buildroot}
 
+%if %{with lang}
 %find_lang %{name}5
+%endif
 
 %post -n %lname -p /sbin/ldconfig
 
 %postun -n %lname -p /sbin/ldconfig
 
+%if %{with lang}
 %files -n %lname-lang -f %{name}5.lang
+%endif
 
 %files -n %lname
 %defattr(-,root,root)