rpm/kinfocenter5
SHA256
1
0
Fork 0
forked from pool/kinfocenter5
Code Pull Requests Activity

Accepting request 242247 from KDE:Frameworks5

Browse Source 
Update to 5.0.0

OBS-URL: https://build.opensuse.org/request/show/242247
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kinfocenter5?expand=0&rev=2
This commit is contained in:
Stephan Kulow 2014-07-25 07:09:13 +00:00 committed by Git OBS Bridge
commit 5edfb24a64
5 changed files with 116 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kinfocenter-4.98.0.tar.xz
View File

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

3
kinfocenter-5.0.0.tar.xz Normal file
View File

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

13
kinfocenter5.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
- 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

11
kinfocenter5.spec
View File

@ -17,13 +17,15 @@
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+
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}/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
@ -44,7 +46,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
@ -57,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

91
opensuse-kinfocenter.diff Normal file
View File

@ -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 <sys/utsname.h>
+#include <KConfig>
+#include <KConfigGroup>
+#include <QString>
+
+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();
}