From 73a1555dc82a6b914fd0505b5f32a3b0a68596ae1313aaff528898d6735e4b14 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 29 Apr 2015 00:13:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=45 --- kinfocenter5.changes | 7 +++++++ kinfocenter5.spec | 3 +++ plasma-session-name.patch | 13 +++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 plasma-session-name.patch diff --git a/kinfocenter5.changes b/kinfocenter5.changes index 1c8cd43..6ce566f 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 29 00:12:36 UTC 2015 - hrvoje.senjan@gmail.com + +- Added plasma-session-name.patch: we use plasma5.desktop for the + session, not plasma.desktop; fixes missing version number in + main kcm + ------------------------------------------------------------------- Thu Apr 23 13:27:22 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kinfocenter5.spec b/kinfocenter5.spec index 5a75da5..7aeb83e 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -26,6 +26,8 @@ Group: System/GUI/KDE Url: http://www.kde.org/ Source: kinfocenter-%{version}.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-OPENSUSE plasma-session-name.patch +Patch0: plasma-session-name.patch BuildRequires: extra-cmake-modules BuildRequires: kcmutils-devel BuildRequires: kcompletion-devel @@ -70,6 +72,7 @@ KDE Utility that provides information about a computer system. %lang_package %prep %setup -q -n kinfocenter-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 diff --git a/plasma-session-name.patch b/plasma-session-name.patch new file mode 100644 index 0000000..011f807 --- /dev/null +++ b/plasma-session-name.patch @@ -0,0 +1,13 @@ +diff --git a/Modules/about-distro/src/Module.cpp b/Modules/about-distro/src/Module.cpp +index 9e9dc9c..7a34520 100644 +--- a/Modules/about-distro/src/Module.cpp ++++ b/Modules/about-distro/src/Module.cpp +@@ -190,7 +190,7 @@ void Module::defaults() + QString Module::plasmaVersion() const + { + const QStringList &filePaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, +- "xsessions/plasma.desktop"); ++ "xsessions/plasma5.desktop"); + + if (filePaths.length() < 1) { + return QString();