Merge pull request #337 from ertugerata/master

ksysguard powerdevil and oxygen fix build
This commit is contained in:
Ertuğrul Erata
2015-08-27 10:31:33 +03:00
5 changed files with 54 additions and 56 deletions
+1 -2
View File
@@ -31,7 +31,7 @@
<Dependency>kwidgetsaddons-devel</Dependency> <Dependency>kwidgetsaddons-devel</Dependency>
<Dependency>kwindowsystem-devel</Dependency> <Dependency>kwindowsystem-devel</Dependency>
<Dependency>kxmlgui-devel</Dependency> <Dependency>kxmlgui-devel</Dependency>
<Dependency release="current">libksysguard-devel</Dependency> <Dependency versionFrom="5.4.0">libksysguard-devel</Dependency>
<Dependency>kdesignerplugin</Dependency> <Dependency>kdesignerplugin</Dependency>
<Dependency>kemoticons-devel</Dependency> <Dependency>kemoticons-devel</Dependency>
<Dependency>kitemmodels-devel</Dependency> <Dependency>kitemmodels-devel</Dependency>
@@ -42,7 +42,6 @@
<Dependency>qt5-base-devel</Dependency> <Dependency>qt5-base-devel</Dependency>
<Dependency>docbook-xsl</Dependency> <Dependency>docbook-xsl</Dependency>
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!--<Patch level="1">0001-Use-run-for-ksysguardd-s-pid-file.patch</Patch> --> <!--<Patch level="1">0001-Use-run-for-ksysguardd-s-pid-file.patch</Patch> -->
+2 -1
View File
@@ -10,7 +10,7 @@
<Summary>KDE Oxygen style</Summary> <Summary>KDE Oxygen style</Summary>
<Description>KDE Oxygen style</Description> <Description>KDE Oxygen style</Description>
<BuildDependencies> <BuildDependencies>
<Dependency>cmake</Dependency> <Dependency>kcmutils-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules</Dependency>
<Dependency>frameworkintegration-devel</Dependency>kdoctools <Dependency>frameworkintegration-devel</Dependency>kdoctools
<Dependency>kdoctools-devel</Dependency> <Dependency>kdoctools-devel</Dependency>
@@ -40,6 +40,7 @@
<Dependency>kconfigwidgets</Dependency> <Dependency>kconfigwidgets</Dependency>
<Dependency>kwidgetsaddons</Dependency> <Dependency>kwidgetsaddons</Dependency>
<Dependency>frameworkintegration</Dependency> <Dependency>frameworkintegration</Dependency>
<Dependency>kcmutils</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin/</Path> <Path fileType="executable">/usr/bin/</Path>
@@ -34,13 +34,12 @@
<Dependency>krunner-devel</Dependency> <Dependency>krunner-devel</Dependency>
<Dependency>ktexteditor-devel</Dependency> <Dependency>ktexteditor-devel</Dependency>
<Dependency>kunitconversion-devel</Dependency> <Dependency>kunitconversion-devel</Dependency>
<Dependency>kwayland-devel</Dependency> <Dependency versionFrom="5.4.0">kwayland-devel</Dependency>
<Dependency>kwin-devel</Dependency> <Dependency versionFrom="5.4.0">kwin-devel</Dependency>
<Dependency>kxmlrpcclient-devel</Dependency> <Dependency>kxmlrpcclient-devel</Dependency>
<Dependency>libdbusmenu-qt-devel</Dependency> <Dependency>libdbusmenu-qt-devel</Dependency>
<Dependency>libgcc</Dependency> <Dependency versionFrom="5.4.0">libkscreen-devel</Dependency>
<Dependency>libkscreen-devel</Dependency> <Dependency versionFrom="5.4.0">libksysguard-devel</Dependency>
<Dependency>libksysguard-devel</Dependency>
<Dependency>libqalculate-devel</Dependency> <Dependency>libqalculate-devel</Dependency>
<Dependency>libX11-devel</Dependency> <Dependency>libX11-devel</Dependency>
<Dependency>libXau-devel</Dependency> <Dependency>libXau-devel</Dependency>
@@ -51,7 +50,7 @@
<Dependency>NetworkManager-devel</Dependency> <Dependency>NetworkManager-devel</Dependency>
<Dependency>networkmanager-qt-devel</Dependency> <Dependency>networkmanager-qt-devel</Dependency>
<Dependency>pam-devel</Dependency> <Dependency>pam-devel</Dependency>
<!--Dependency>prison-qt5-devel</Dependency--> <Dependency>prison-qt5-devel</Dependency>
<Dependency>qt5-base-devel</Dependency> <Dependency>qt5-base-devel</Dependency>
<Dependency>xorg-app-devel</Dependency> <Dependency>xorg-app-devel</Dependency>
<Dependency>qt5-sql-mysql</Dependency> <Dependency>qt5-sql-mysql</Dependency>
@@ -65,7 +64,6 @@
<Dependency>zlib-devel</Dependency> <Dependency>zlib-devel</Dependency>
<Dependency>docbook-xsl</Dependency> <Dependency>docbook-xsl</Dependency>
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
@@ -128,6 +126,7 @@
<Dependency>libXrender</Dependency> <Dependency>libXrender</Dependency>
<Dependency>networkmanager-qt</Dependency> <Dependency>networkmanager-qt</Dependency>
<Dependency>pam</Dependency> <Dependency>pam</Dependency>
<Dependency>prison-qt5</Dependency>
<Dependency>plasma-framework</Dependency> <Dependency>plasma-framework</Dependency>
<Dependency>qt5-base</Dependency> <Dependency>qt5-base</Dependency>
<Dependency>qt5-declarative</Dependency> <Dependency>qt5-declarative</Dependency>
+1 -2
View File
@@ -26,9 +26,8 @@
<Dependency>kitemmodels-devel</Dependency> <Dependency>kitemmodels-devel</Dependency>
<Dependency>kemoticons-devel</Dependency> <Dependency>kemoticons-devel</Dependency>
<Dependency>docbook-xsl</Dependency> <Dependency>docbook-xsl</Dependency>
<Dependency>plasma-workspace-devel</Dependency> <Dependency versionFrom="5.4.0">plasma-workspace-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>