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

Accepting request 304474 from KDE:Frameworks5

Browse Source 
- Added plasma-session-name.patch: we use plasma5.desktop for the
  session, not plasma.desktop; fixes missing version number in
  main kcm

- 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

- 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
- Added kdeclarative-devel and kpackage-devel BuildRequires
- Drop opensuse-kinfocenter.diff, no longer needed

OBS-URL: https://build.opensuse.org/request/show/304474
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kinfocenter5?expand=0&rev=12
This commit is contained in:
Stephan Kulow 2015-05-11 17:32:14 +00:00 committed by Git OBS Bridge
commit 6c4a369c3a
6 changed files with 61 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kinfocenter-5.2.2.tar.xz
View File

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

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

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

26
kinfocenter5.changes
View File

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

25
kinfocenter5.spec
View File

@ -16,8 +16,9 @@
#
%bcond_without lang
Name: kinfocenter5
Version: 5.2.2
Version: 5.3.0
Release: 0
Summary: Utility that provides information about a computer system
License: GPL-2.0+
@ -25,17 +26,19 @@ 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
# PATCH-FIX-OPENSUSE plasma-session-name.patch
Patch0: plasma-session-name.patch
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 +46,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)
@ -55,10 +58,12 @@ 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}
Recommends: %{name}-lang
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -91,16 +96,24 @@ 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/
%{_kf5_configdir}/menus/kinfocenter.menu
%{_kf5_sharedir}/desktop-directories/
%if %{with lang}
%files lang
%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/
%endif
%changelog

91
opensuse-kinfocenter.diff
View File

@ -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 <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();
}

13
plasma-session-name.patch Normal file
View File

@ -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();