kinfocenter version bump and check

This commit is contained in:
groni
2015-07-01 18:02:56 +02:00
parent 9a25647370
commit 1b86cac3e5
4 changed files with 228 additions and 0 deletions
+19
View File
@@ -0,0 +1,19 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import kde5
from pisi.actionsapi import pisitools
def setup():
kde5.configure()
def build():
kde5.make()
def install():
kde5.install()
pisitools.dodoc("COPYING")
@@ -0,0 +1,4 @@
[General]
2 Name=Pisi Linux
3 LogoPath=/usr/share/apps/about-distro/pisilinux.png
4 Website=http://www.pisilinux.org/
@@ -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("PisiLinux")));
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();
}
+114
View File
@@ -0,0 +1,114 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>kinfocenter</Name>
<Homepage>http://www.kde.org</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>LGPLv2</License>
<IsA>library</IsA>
<IsA>app:console</IsA>
<Summary>KDE5 info center</Summary>
<Description>KDE5 Utility that provides information about a computer system. </Description>
<Archive sha1sum="44128252c2230568b3204806b756464686d23c8d" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/kinfocenter-5.3.2.tar.xz</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>python3</Dependency>
<Dependency>pciutils-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>kcmutils-devel</Dependency>
<Dependency>kcompletion-devel</Dependency>
<Dependency>kconfig-devel</Dependency>
<Dependency>kdelibs4-support-devel</Dependency>
<Dependency>kdoctools-devel</Dependency>
<Dependency>ki18n-devel</Dependency>
<Dependency>kio-devel</Dependency>
<Dependency>kwindowsystem-devel</Dependency>
<Dependency>kxmlgui-devel</Dependency>
<Dependency>kservice-devel</Dependency>
<Dependency>kcoreaddons-devel</Dependency>
<Dependency>kdbusaddons-devel</Dependency>
<Dependency>kiconthemes-devel</Dependency>
<Dependency>kconfigwidgets-devel</Dependency>
<Dependency>kwidgetsaddons-devel</Dependency>
<Dependency>libraw1394-devel</Dependency>
<Dependency>plasma-framework-devel</Dependency>
<Dependency>solid-devel</Dependency>
<Dependency>pciutils-devel</Dependency>
<Dependency>mesa-glu-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
</BuildDependencies>
<Patches>
<!--<Patch level="1">pisilinux-kinfocenter.diff</Patch> -->
</Patches>
</Source>
<Package>
<Name>kinfocenter</Name>
<RuntimeDependencies>
<Dependency>qt5-base</Dependency>
<Dependency>qt5-declarative</Dependency>
<Dependency>pciutils</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>kservice</Dependency>
<Dependency>kcoreaddons</Dependency>
<Dependency>kdbusaddons</Dependency>
<Dependency>kiconthemes</Dependency>
<Dependency>kconfigwidgets</Dependency>
<Dependency>kwidgetsaddons</Dependency>
<Dependency>kcompletion</Dependency>
<Dependency>kconfig</Dependency>
<Dependency>kdelibs4-support</Dependency>
<Dependency>ki18n</Dependency>
<Dependency>kio</Dependency>
<Dependency>kxmlgui</Dependency>
<Dependency>libraw1394</Dependency>
<Dependency>kwayland</Dependency>
<Dependency>kcmutils</Dependency>
<Dependency>solid</Dependency>
<Dependency>kdeclarative</Dependency>
<Dependency>mesa-glu</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/cmake</Path>
<Path fileType="library">/usr/lib/qt5</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/share/kde4/config/kcm-about-distrorc">kcm-about-distrorc</AdditionalFile>
</AdditionalFiles>
<Replaces>
<Package>kde-workspace</Package>
</Replaces>
<Conflicts>
<Package>kde-workspace</Package>
</Conflicts>
</Package>
<History>
<Update release="2">
<Date>2015-07-01</Date>
<Version>5.3.2</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2015-06-11</Date>
<Version>5.3.1</Version>
<Comment>First Release.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
</History>
</PISI>