From 6e786688e37f94adee47706315959692255cc6df8c33fe16e2fedb42e4070990 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 11 Jul 2014 18:50:51 +0000 Subject: [PATCH 1/5] 5.0.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=7 --- kinfocenter-5.0.0.tar.xz | 3 +++ kinfocenter5.changes | 6 ++++++ kinfocenter5.spec | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 kinfocenter-5.0.0.tar.xz diff --git a/kinfocenter-5.0.0.tar.xz b/kinfocenter-5.0.0.tar.xz new file mode 100644 index 0000000..f9ba28f --- /dev/null +++ b/kinfocenter-5.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c45de42f52ba197c23765e786becd64a9ac0ce96285a985136fb54e2c6110c9 +size 1062652 diff --git a/kinfocenter5.changes b/kinfocenter5.changes index d3d40ba..13b234a 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 11 18:49:15 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.0.0 + * Plasma 5.0 Final + ------------------------------------------------------------------- Thu Jul 10 16:56:40 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kinfocenter5.spec b/kinfocenter5.spec index 4fda2ab..f453598 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -17,7 +17,7 @@ Name: kinfocenter5 -Version: 4.98.0 +Version: 5.0.0 Release: 0 Summary: Utility that provides information about a computer system License: GPL-2.0+ From 6f6d6fce41f8aa99134f90f121b4e78e577fef27b46da3463dde0d3f3a496863 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 11 Jul 2014 21:01:45 +0000 Subject: [PATCH 2/5] URL OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=8 --- kinfocenter-5.0.0.tar.xz | 3 --- kinfocenter5.changes | 6 ------ kinfocenter5.spec | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 kinfocenter-5.0.0.tar.xz diff --git a/kinfocenter-5.0.0.tar.xz b/kinfocenter-5.0.0.tar.xz deleted file mode 100644 index f9ba28f..0000000 --- a/kinfocenter-5.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c45de42f52ba197c23765e786becd64a9ac0ce96285a985136fb54e2c6110c9 -size 1062652 diff --git a/kinfocenter5.changes b/kinfocenter5.changes index 13b234a..d3d40ba 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri Jul 11 18:49:15 UTC 2014 - hrvoje.senjan@gmail.com - -- Update to 5.0.0 - * Plasma 5.0 Final - ------------------------------------------------------------------- Thu Jul 10 16:56:40 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kinfocenter5.spec b/kinfocenter5.spec index f453598..0bf7ce2 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -23,7 +23,7 @@ Summary: Utility that provides information about a computer system License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org/ -Source: http://download.kde.org/unstable/plasma/%{version}/src/kinfocenter-%{version}.tar.xz +Source: http://download.kde.org/stable/plasma/%{version}/src/kinfocenter-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: kcmutils-devel BuildRequires: kcompletion-devel From 03b76837c90b5c65cd34a24472a9475437d41a74b00b05735c81e6952eae29f6 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 12 Jul 2014 08:28:54 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=9 --- kinfocenter5.changes | 7 +++++++ kinfocenter5.spec | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/kinfocenter5.changes b/kinfocenter5.changes index d3d40ba..3cb7b54 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 11 18:49:15 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.0.0 + * Plasma 5.0 Final +- Adjust BuildRequires depending whether Qt is built with openGL or open GL ES2 + ------------------------------------------------------------------- Thu Jul 10 16:56:40 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kinfocenter5.spec b/kinfocenter5.spec index 0bf7ce2..be80a5d 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -44,7 +44,11 @@ BuildRequires: xz BuildRequires: pkgconfig(Qt5Core) >= 5.3.0 BuildRequires: pkgconfig(Qt5Gui) >= 5.3.0 BuildRequires: pkgconfig(egl) +%ifarch %arm aarch64 +BuildRequires: pkgconfig(glesv2) +%else BuildRequires: pkgconfig(gl) +%endif BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(wayland-client) Conflicts: kdebase4-workspace From db418f44c0ee63a6de1c83f50bef2809493b6a3f18b6e3241ba8f37dc5f175cd Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 18 Jul 2014 21:35:41 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=11 --- kinfocenter5.changes | 6 +++ kinfocenter5.spec | 3 ++ opensuse-kinfocenter.diff | 91 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 opensuse-kinfocenter.diff diff --git a/kinfocenter5.changes b/kinfocenter5.changes index 3cb7b54..165cf37 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 18 21:32:42 UTC 2014 - hrvoje.senjan@gmail.com + +- Added opensuse-kinfocenter.diff to have some openSUSE distro info + in kinfocenter (backported from 4.11.x kdebase4-workspace package) + ------------------------------------------------------------------- Fri Jul 11 18:49:15 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kinfocenter5.spec b/kinfocenter5.spec index be80a5d..04b3d01 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -24,6 +24,8 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org/ Source: http://download.kde.org/stable/plasma/%{version}/src/kinfocenter-%{version}.tar.xz +# 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 @@ -61,6 +63,7 @@ KDE Utility that provides information about a computer system. %prep %setup -q -n kinfocenter-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DBUILD_po=OFF diff --git a/opensuse-kinfocenter.diff b/opensuse-kinfocenter.diff new file mode 100644 index 0000000..96592f2 --- /dev/null +++ b/opensuse-kinfocenter.diff @@ -0,0 +1,91 @@ +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(PLASMA_VERSION_STRING)); + 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 14d1f7aa0d1c320f0f6a6f874ea091da2b49f0f5b307dba92317bd4ea1cc6f66 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Thu, 24 Jul 2014 17:17:19 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=12 --- kinfocenter5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kinfocenter5.spec b/kinfocenter5.spec index 04b3d01..9324ce4 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -23,7 +23,7 @@ Summary: Utility that provides information about a computer system License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org/ -Source: http://download.kde.org/stable/plasma/%{version}/src/kinfocenter-%{version}.tar.xz +Source: http://download.kde.org/stable/plasma/%{version}/kinfocenter-%{version}.tar.xz # 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