From 8a11606e05474bab400052ab557f8a8995046f0b58b8c7a20c9da1d8da7579dc Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 5 Apr 2015 11:50:09 +0000 Subject: [PATCH 1/6] 5.9.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcmutils?expand=0&rev=49 --- kcmutils-5.8.0.tar.xz | 3 --- kcmutils-5.9.0.tar.xz | 3 +++ kcmutils.changes | 11 +++++++++++ kcmutils.spec | 17 +++++++++++------ 4 files changed, 25 insertions(+), 9 deletions(-) delete mode 100644 kcmutils-5.8.0.tar.xz create mode 100644 kcmutils-5.9.0.tar.xz diff --git a/kcmutils-5.8.0.tar.xz b/kcmutils-5.8.0.tar.xz deleted file mode 100644 index bfa8a64..0000000 --- a/kcmutils-5.8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c4915f8686242ac7c39b515c44ce56074c953fa5cf207e3fc6cd6f25a25a17e -size 232908 diff --git a/kcmutils-5.9.0.tar.xz b/kcmutils-5.9.0.tar.xz new file mode 100644 index 0000000..6d5689e --- /dev/null +++ b/kcmutils-5.9.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5807b99844a20eba2d0ce9e92fa20bf1171e262ca7cf13dee966dd69a0bf257 +size 234128 diff --git a/kcmutils.changes b/kcmutils.changes index ec63772..d4fa0b8 100644 --- a/kcmutils.changes +++ b/kcmutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Apr 4 14:41:04 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.9.0 + * 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 + ------------------------------------------------------------------- Sat Mar 7 16:59:02 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kcmutils.spec b/kcmutils.spec index 84b1e46..ee72868 100644 --- a/kcmutils.spec +++ b/kcmutils.spec @@ -17,23 +17,27 @@ %define lname libKF5KCMUtils5 -%define _tar_path 5.8 +%define _tar_path 5.9 Name: kcmutils Version: %{_tar_path}.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.8.0 +BuildRequires: extra-cmake-modules >= %{version} BuildRequires: fdupes BuildRequires: kconfigwidgets-devel >= %{kf5_version} BuildRequires: kcoreaddons-devel >= %{kf5_version} +BuildRequires: kdeclarative-devel >= %{kf5_version} BuildRequires: kf5-filesystem BuildRequires: ki18n-devel >= %{kf5_version} BuildRequires: kiconthemes-devel >= %{kf5_version} BuildRequires: kitemviews-devel >= %{kf5_version} +BuildRequires: kpackage-devel >= %{kf5_version} BuildRequires: kservice-devel >= %{kf5_version} BuildRequires: kxmlgui-devel >= %{kf5_version} 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+ @@ -63,10 +67,7 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules Requires: kconfigwidgets-devel >= %{kf5_version} -Requires: kiconthemes-devel >= %{kf5_version} -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 @@ -84,7 +85,11 @@ created with the KConfigWidgets framework. Development files. %kf5_makeinstall -C build %fdupes -s %{buildroot} - %find_lang %{name}5 +if [ -e po ]; then +%find_lang %{name}5 +else +touch %{name}5.lang +fi %post -n %lname -p /sbin/ldconfig From fc7711feb25872a8e8f545d1b1ad0ecf202f604a6acc4f104fa23e268e1a4beb Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 10 Apr 2015 10:39:27 +0000 Subject: [PATCH 2/6] changelogs OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcmutils?expand=0&rev=50 --- kcmutils.changes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kcmutils.changes b/kcmutils.changes index d4fa0b8..8e304f5 100644 --- a/kcmutils.changes +++ b/kcmutils.changes @@ -2,6 +2,10 @@ 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, From ff44a311e549af3e824f31553834b674594a3f8109ac2d5ee4e129a7b119918d Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 10 Apr 2015 16:29:13 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcmutils?expand=0&rev=51 --- kcmutils.spec | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/kcmutils.spec b/kcmutils.spec index ee72868..ea589f5 100644 --- a/kcmutils.spec +++ b/kcmutils.spec @@ -16,25 +16,26 @@ # +%bcond_without lang %define lname libKF5KCMUtils5 %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 >= %{version} +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes -BuildRequires: kconfigwidgets-devel >= %{kf5_version} -BuildRequires: kcoreaddons-devel >= %{kf5_version} -BuildRequires: kdeclarative-devel >= %{kf5_version} +BuildRequires: kconfigwidgets-devel >= %{_tar_path} +BuildRequires: kcoreaddons-devel >= %{_tar_path} +BuildRequires: kdeclarative-devel >= %{_tar_path} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{kf5_version} -BuildRequires: kiconthemes-devel >= %{kf5_version} -BuildRequires: kitemviews-devel >= %{kf5_version} -BuildRequires: kpackage-devel >= %{kf5_version} -BuildRequires: kservice-devel >= %{kf5_version} -BuildRequires: kxmlgui-devel >= %{kf5_version} +BuildRequires: ki18n-devel >= %{_tar_path} +BuildRequires: kiconthemes-devel >= %{_tar_path} +BuildRequires: kitemviews-devel >= %{_tar_path} +BuildRequires: kpackage-devel >= %{_tar_path} +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 @@ -55,7 +56,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 @@ -66,8 +69,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: kservice-devel >= %{kf5_version} +Requires: kconfigwidgets-devel >= %{_tar_path} +Requires: kservice-devel >= %{_tar_path} %description devel KCMUtils provides various classes to work with KCModules. KCModules can be @@ -85,17 +88,17 @@ created with the KConfigWidgets framework. Development files. %kf5_makeinstall -C build %fdupes -s %{buildroot} -if [ -e po ]; then +%if %{with lang} %find_lang %{name}5 -else -touch %{name}5.lang -fi +%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) From d6cd9b90381d8fb3862aa33dea2955aadfc9ef4904a1c45a3e8bce64d2fad81f Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 10 Apr 2015 16:49:11 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcmutils?expand=0&rev=52 --- kcmutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcmutils.spec b/kcmutils.spec index ea589f5..4dc0b24 100644 --- a/kcmutils.spec +++ b/kcmutils.spec @@ -86,7 +86,7 @@ created with the KConfigWidgets framework. Development files. %install %kf5_makeinstall -C build - %fdupes -s %{buildroot} + %fdupes %{buildroot} %if %{with lang} %find_lang %{name}5 From 1b4991d53f3c31c4f2385058ed98faa7dd9c6ae5d1a1af887cb39f49cb81a4fe Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 13 Apr 2015 01:13:11 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcmutils?expand=0&rev=53 --- kcmutils-use-susehelp.patch | 13 +++++++++++++ kcmutils.changes | 2 ++ kcmutils.spec | 3 +++ 3 files changed, 18 insertions(+) create mode 100644 kcmutils-use-susehelp.patch diff --git a/kcmutils-use-susehelp.patch b/kcmutils-use-susehelp.patch new file mode 100644 index 0000000..62efb3a --- /dev/null +++ b/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); + } diff --git a/kcmutils.changes b/kcmutils.changes index 8e304f5..c671996 100644 --- a/kcmutils.changes +++ b/kcmutils.changes @@ -12,6 +12,8 @@ Sat Apr 4 14:41:04 UTC 2015 - hrvoje.senjan@gmail.com 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 diff --git a/kcmutils.spec b/kcmutils.spec index 4dc0b24..4e96d8e 100644 --- a/kcmutils.spec +++ b/kcmutils.spec @@ -46,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-UPSTREAM 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 @@ -79,6 +81,7 @@ created with the KConfigWidgets framework. Development files. %lang_package -n %lname %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build From 25d1186651390765c9a85775c26c26ef081089f35de7d52e197b0730d7ee96d9 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 13 Apr 2015 01:14:46 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcmutils?expand=0&rev=54 --- kcmutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcmutils.spec b/kcmutils.spec index 4e96d8e..ce41ad6 100644 --- a/kcmutils.spec +++ b/kcmutils.spec @@ -46,7 +46,7 @@ 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-UPSTREAM kcmutils-use-susehelp.patch -- Use susehelp wrapper, instead of khelpcenter command (we use khelpcenter5) +# 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