From 35dcff7a443b11bef102694f1fa39c80d53479d304587086c1a8677e6003bc6f Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 10 Apr 2015 18:28:52 +0000 Subject: [PATCH 1/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=38 --- kinfocenter-5.2.2.tar.xz | 3 --- kinfocenter-5.2.95.tar.xz | 3 +++ kinfocenter5.spec | 13 +++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 kinfocenter-5.2.2.tar.xz create mode 100644 kinfocenter-5.2.95.tar.xz diff --git a/kinfocenter-5.2.2.tar.xz b/kinfocenter-5.2.2.tar.xz deleted file mode 100644 index 8bf62d7..0000000 --- a/kinfocenter-5.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74629647897a6ff7d2bae45d1d8c1c473ed2c9a65cc7877b042114e1e81bb02b -size 1074964 diff --git a/kinfocenter-5.2.95.tar.xz b/kinfocenter-5.2.95.tar.xz new file mode 100644 index 0000000..1729956 --- /dev/null +++ b/kinfocenter-5.2.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b510195dce46909b3663e778d9cca21d95467520db291611f577f00b5bd2941 +size 1043088 diff --git a/kinfocenter5.spec b/kinfocenter5.spec index f338e15..732162f 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -16,8 +16,9 @@ # +%bcond_without lang Name: kinfocenter5 -Version: 5.2.2 +Version: 5.2.95 Release: 0 Summary: Utility that provides information about a computer system License: GPL-2.0+ @@ -25,17 +26,17 @@ Group: System/GUI/KDE Url: http://www.kde.org/ Source: kinfocenter-%{version}.tar.xz Source99: %{name}-rpmlintrc -# PATCH-FIX-OPENSUSE opensuse-kinfocenter.diff (created by Alin M. Elena to have some openSUSE distro info in kinfocenter) -Patch0: opensuse-kinfocenter.diff BuildRequires: extra-cmake-modules BuildRequires: kcmutils-devel BuildRequires: kcompletion-devel BuildRequires: kconfig-devel +BuildRequires: kdeclarative-devel BuildRequires: kdelibs4support-devel BuildRequires: kdoctools-devel BuildRequires: kf5-filesystem BuildRequires: ki18n-devel BuildRequires: kio-devel +BuildRequires: kpackage-devel BuildRequires: kxmlgui-devel BuildRequires: libraw1394-devel BuildRequires: pciutils-devel @@ -43,8 +44,8 @@ BuildRequires: plasma-framework-devel BuildRequires: solid-devel BuildRequires: update-desktop-files BuildRequires: xz -BuildRequires: pkgconfig(Qt5Core) >= 5.3.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.3.0 +BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 +BuildRequires: pkgconfig(Qt5Gui) >= 5.4.0 BuildRequires: pkgconfig(egl) %ifarch %arm aarch64 BuildRequires: pkgconfig(glesv2) @@ -67,7 +68,6 @@ 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 @@ -91,6 +91,7 @@ KDE Utility that provides information about a computer system. %doc %{_kf5_htmldir}/en/kinfocenter/ %{_kf5_sharedir}/kcmusb/ %{_kf5_sharedir}/kcmview1394/ +%{_kf5_sharedir}/kpackage/ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ %{_kf5_sharedir}/kxmlgui5/ From ceba3c66b3af5db93c5bb20c03c1aa5ebecdfe02b46b68c90e7d30f386348885 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 10 Apr 2015 19:03:33 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=39 --- kinfocenter5.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kinfocenter5.spec b/kinfocenter5.spec index 732162f..53da92f 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -102,6 +102,11 @@ KDE Utility that provides information about a computer system. %defattr(-,root,root) %doc COPYING* %{_kf5_localedir}/ +%doc %lang(de) %{_kf5_htmldir}/de/ +%doc %lang(it) %{_kf5_htmldir}/it/ +%doc %lang(nl) %{_kf5_htmldir}/nl/ +%doc %lang(sv) %{_kf5_htmldir}/sv/ +%doc %lang(uk) %{_kf5_htmldir}/uk/ %doc %lang(pt_BR) %{_kf5_htmldir}/pt_BR/ %changelog From 13aa481c0998b824da004a851d483057a944a75fddb4f6980e7a004cee090ee9 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 10 Apr 2015 19:03:39 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=40 --- opensuse-kinfocenter.diff | 91 --------------------------------------- 1 file changed, 91 deletions(-) delete mode 100644 opensuse-kinfocenter.diff diff --git a/opensuse-kinfocenter.diff b/opensuse-kinfocenter.diff deleted file mode 100644 index 58570b2..0000000 --- a/opensuse-kinfocenter.diff +++ /dev/null @@ -1,91 +0,0 @@ -diff --git a/Modules/infosummary/infosum.cpp b/Modules/infosummary/infosum.cpp -index e58beb0..02f000c 100644 ---- a/Modules/infosummary/infosum.cpp -+++ b/Modules/infosummary/infosum.cpp -@@ -61,12 +61,12 @@ void InfoSumPlugin::createDisplay() - void InfoSumPlugin::createOsBox() - { - DefaultBoxWidget *osWidget = new DefaultBoxWidget(); -- osWidget->setIcon(QIcon::fromTheme(QStringLiteral("kde"))); -+ osWidget->setIcon(QIcon::fromTheme(QStringLiteral("suse"))); - osWidget->setLabelTitles(i18n("OS Version"),i18n("KDE Plasma Version"), i18n("Hostname")); - - OsDepInfo *osInfo = new OsDepInfo(); - -- osWidget->setLabelOne(osInfo->osVersion()); -+ osWidget->setLabelOne(osInfo->osVersion()+'\n'+osInfo->distroName()); - osWidget->setLabelTwo(QString(PROJECT_VERSION)); - osWidget->setLabelThree(osInfo->hostName()); - osWidget->setWhatsThis(i18nc("OS whats this","This shows information about your Operating System")); -diff --git a/Modules/infosummary/osdepinfo.cpp b/Modules/infosummary/osdepinfo.cpp -index 34afecc..8b7043f 100644 ---- a/Modules/infosummary/osdepinfo.cpp -+++ b/Modules/infosummary/osdepinfo.cpp -@@ -37,6 +37,11 @@ const QString OsDepInfo::osVersion() - return m_osVersion; - } - -+const QString OsDepInfo::distroName() -+{ -+ return m_distroName; -+} -+ - #if defined(Q_OS_UNIX) - #include "osdepinfo_unix.cpp" - #else -@@ -50,6 +55,7 @@ void OsDepInfo::setDepInfo() - { - m_osVersion.clear(); - m_hostName.clear(); -+ m_distroName.clear(); - } - - #endif // Q_OS_UNIX -diff --git a/Modules/infosummary/osdepinfo.h b/Modules/infosummary/osdepinfo.h -index 3452e8b..564a86c 100644 ---- a/Modules/infosummary/osdepinfo.h -+++ b/Modules/infosummary/osdepinfo.h -@@ -32,12 +32,14 @@ class OsDepInfo - - const QString hostName(); - const QString osVersion(); -+ const QString distroName(); - - private: - void setDepInfo(); - - QString m_hostName; - QString m_osVersion; -+ QString m_distroName; - }; - - #endif //OSDEPINFO -diff --git a/Modules/infosummary/osdepinfo_unix.cpp b/Modules/infosummary/osdepinfo_unix.cpp -index d237337..3971945 100644 ---- a/Modules/infosummary/osdepinfo_unix.cpp -+++ b/Modules/infosummary/osdepinfo_unix.cpp -@@ -23,6 +23,18 @@ - #include "osdepinfo.h" - - #include -+#include -+#include -+#include -+ -+QString getDistro() -+{ -+ KConfig osRelease( "/etc/os-release", KConfig::SimpleConfig ); -+ KConfigGroup osR( &osRelease, "" ); -+ QString pretty = osR.readEntry("PRETTY_NAME"); -+ pretty.remove('"'); -+ return(pretty); -+} - - void OsDepInfo::setDepInfo() - { -@@ -31,4 +43,5 @@ void OsDepInfo::setDepInfo() - - m_osVersion = QString(unixInfo.sysname) + ' ' + QString(unixInfo.release); - m_hostName = QString(unixInfo.nodename); -+ m_distroName = getDistro(); - } From 743d015ef23e535004f333cb7e8d7216d1db9890a227802a804f0cdc0f410386 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 11 Apr 2015 18:56:41 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=41 --- kinfocenter5.changes | 9 +++++++++ kinfocenter5.spec | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/kinfocenter5.changes b/kinfocenter5.changes index 3590e16..9706546 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Apr 11 18:53:35 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.2.95 aka 5.3 beta: + * New feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.2.95.php +- Update required Qt version to 5.4.0 + ------------------------------------------------------------------- Thu Mar 19 17:42:32 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kinfocenter5.spec b/kinfocenter5.spec index 53da92f..fb401fc 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -59,7 +59,9 @@ BuildRequires: kwayland-devel >= 5.0.95 Conflicts: kdebase4-workspace # /etc/xdg/menus/kde-information.menu Conflicts: kdebase3 +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -98,6 +100,7 @@ KDE Utility that provides information about a computer system. %{_kf5_configdir}/menus/kinfocenter.menu %{_kf5_sharedir}/desktop-directories/ +%if %{with lang} %files lang %defattr(-,root,root) %doc COPYING* @@ -108,5 +111,6 @@ KDE Utility that provides information about a computer system. %doc %lang(sv) %{_kf5_htmldir}/sv/ %doc %lang(uk) %{_kf5_htmldir}/uk/ %doc %lang(pt_BR) %{_kf5_htmldir}/pt_BR/ +%endif %changelog From 5ec152da4dbce73fe0f443797eaf1395232274a31a8bfbd6b453c775c4bd36f3 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 14 Apr 2015 09:13:04 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=42 --- kinfocenter5.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kinfocenter5.changes b/kinfocenter5.changes index 9706546..9135899 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -6,6 +6,8 @@ Sat Apr 11 18:53:35 UTC 2015 - hrvoje.senjan@gmail.com * For more details please see: https://www.kde.org/announcements/plasma-5.2.95.php - Update required Qt version to 5.4.0 +- Added kdeclarative-devel and kpackage-devel BuildRequires +- Drop opensuse-kinfocenter.diff, no longer needed ------------------------------------------------------------------- Thu Mar 19 17:42:32 UTC 2015 - hrvoje.senjan@gmail.com From 14ed4bd6647a2c0a337b495df08c3e50188ec871c0b0f9ce5e4a1f7bc6e5a3f1 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Thu, 23 Apr 2015 13:47:56 +0000 Subject: [PATCH 6/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=43 --- kinfocenter-5.2.95.tar.xz | 3 --- kinfocenter-5.3.0.tar.xz | 3 +++ kinfocenter5.changes | 7 +++++++ kinfocenter5.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 kinfocenter-5.2.95.tar.xz create mode 100644 kinfocenter-5.3.0.tar.xz diff --git a/kinfocenter-5.2.95.tar.xz b/kinfocenter-5.2.95.tar.xz deleted file mode 100644 index 1729956..0000000 --- a/kinfocenter-5.2.95.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b510195dce46909b3663e778d9cca21d95467520db291611f577f00b5bd2941 -size 1043088 diff --git a/kinfocenter-5.3.0.tar.xz b/kinfocenter-5.3.0.tar.xz new file mode 100644 index 0000000..0ef9c17 --- /dev/null +++ b/kinfocenter-5.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cb666bc974d26e269cf07f050049b47bb523530e14ab60802ee0c1902b7f60b +size 1049908 diff --git a/kinfocenter5.changes b/kinfocenter5.changes index 9135899..4b5be13 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 23 13:27:22 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.3 Final: + * For more details please see: + https://www.kde.org/announcements/plasma-5.3.0.php + ------------------------------------------------------------------- Sat Apr 11 18:53:35 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kinfocenter5.spec b/kinfocenter5.spec index fb401fc..9fa7746 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kinfocenter5 -Version: 5.2.95 +Version: 5.3.0 Release: 0 Summary: Utility that provides information about a computer system License: GPL-2.0+ From ac69dd2a817e45c63f0bf053ef5e7550bca5f75f7e24b3176800be532c086c4b Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 27 Apr 2015 18:40:46 +0000 Subject: [PATCH 7/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=44 --- kinfocenter5.changes | 1 + kinfocenter5.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kinfocenter5.changes b/kinfocenter5.changes index 4b5be13..1c8cd43 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -4,6 +4,7 @@ Thu Apr 23 13:27:22 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.3 Final: * For more details please see: https://www.kde.org/announcements/plasma-5.3.0.php +- Only conflict with kdebase4-workspace < 5.3.0 ------------------------------------------------------------------- Sat Apr 11 18:53:35 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kinfocenter5.spec b/kinfocenter5.spec index 9fa7746..5a75da5 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -56,7 +56,7 @@ BuildRequires: pkgconfig(glu) %if 0%{?suse_version} > 1310 BuildRequires: kwayland-devel >= 5.0.95 %endif -Conflicts: kdebase4-workspace +Conflicts: kdebase4-workspace < 5.3.0 # /etc/xdg/menus/kde-information.menu Conflicts: kdebase3 %if %{with lang} From 73a1555dc82a6b914fd0505b5f32a3b0a68596ae1313aaff528898d6735e4b14 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 29 Apr 2015 00:13:58 +0000 Subject: [PATCH 8/8] 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();