- rel 2; proper path to our qdbus

diff --git a/kp5-plasma-workspace-scripts.patch b/kp5-plasma-workspace-scripts.patch
new file mode 100644 (file)
index 0000000..26e3d66
--- /dev/null
+++ b/kp5-plasma-workspace-scripts.patch
@@ -0,0 +1,11 @@
+--- plasma-workspace-5.4.0/startkde/startkde.cmake~    2015-08-22 12:45:41.000000000 +0200
++++ plasma-workspace-5.4.0/startkde/startkde.cmake     2015-09-07 11:35:11.917890454 +0200
+@@ -29,6 +29,8 @@
+   qdbus=qdbus
+ fi
+ 
++qdbus=/usr/bin/qdbus
++
+ # Check if a KDE session already is running and whether it's possible to connect to X
+ kcheckrunning
+ kcheckrunning_result=$?

diff --git a/kp5-plasma-workspace.spec b/kp5-plasma-workspace.spec
index 8103a93c2b48b51c9ea356cfb7c72e58c8ffab80..fe599d222af8a9ab1a525852f56c0da73c0b3421 100644 (file)
--- a/kp5-plasma-workspace.spec
+++ b/kp5-plasma-workspace.spec
@@ -10,12 +10,13 @@
 Summary:       KDE Plasma Workspace
 Name:          kp5-%{kpname}
 Version:       5.4.0
-Release:       1
+Release:       2
 License:       LGPL v2.1+
 Group:         X11/Libraries
 Source0:       http://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz
 # Source0-md5: 0bb91a876188f98791358017c85ccec8
 Patch0:                kp5-plasma-workspace-absolute-path.patch
+Patch1:                kp5-plasma-workspace-scripts.patch
 URL:           http://www.kde.org/
 BuildRequires: Qt5Core-devel >= %{qtver}
 BuildRequires: cmake >= 2.8.12
@@ -40,7 +41,6 @@ BuildRequires:        kf5-kwallet-devel
 BuildRequires: kf5-kxmlrpcclient-devel
 BuildRequires: kf5-networkmanager-qt-devel
 BuildRequires: kf5-plasma-framework-devel
-BuildRequires: kf5-plasma-framework-devel
 BuildRequires: kp5-libkscreen-devel
 BuildRequires: kp5-libksysguard-devel
 BuildRequires: libqalculate-devel
@@ -69,6 +69,7 @@ Pliki nagłówkowe dla programistów używających %{kpname}.
 %prep
 %setup -q -n %{kpname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build