pool/kactivities5
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=26

Browse Source
This commit is contained in:
Hrvoje Senjan 2014-06-01 19:28:56 +00:00 committed by Git OBS Bridge
parent 96a9463237
commit 50f580f180
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kactivities5.spec
View File

@ -36,6 +36,7 @@ BuildRequires: kcoreaddons-devel >= %{_kf5_version}
BuildRequires: kdbusaddons-devel >= %{_kf5_version} BuildRequires: kdbusaddons-devel >= %{_kf5_version}
BuildRequires: kf5-filesystem BuildRequires: kf5-filesystem
BuildRequires: ki18n-devel >= %{_kf5_version} BuildRequires: ki18n-devel >= %{_kf5_version}
BuildRequires: kio-devel >= %{_kf5_version}
BuildRequires: kservice-devel >= %{_kf5_version} BuildRequires: kservice-devel >= %{_kf5_version}
BuildRequires: kwindowsystem-devel >= %{_kf5_version} BuildRequires: kwindowsystem-devel >= %{_kf5_version}
BuildRequires: xz BuildRequires: xz
@ -65,7 +66,7 @@ Summary: KDE Base Libraries
Group: Development/Libraries/KDE Group: Development/Libraries/KDE
Requires: %lname = %{version} Requires: %lname = %{version}
Requires: extra-cmake-modules >= 0.0.14 Requires: extra-cmake-modules >= 0.0.14
Requires: kdbusaddons-devel >= %{_kf5_version} Requires: pkgconfig(Qt5Core) >= 5.2.0
Obsoletes: kf5-kactivities-devel Obsoletes: kf5-kactivities-devel
%description devel %description devel

15
kamd-rename.patch
View File

@ -29,8 +29,21 @@ index 2a81ff8..fc653a4 100644
#endif #endif
} }
diff --git a/src/service/Application.cpp b/src/service/Application.cpp
index 7c88f78..217b0d4 100644
--- a/src/service/Application.cpp
+++ b/src/service/Application.cpp
@@ -349,7 +349,7 @@ int main(int argc, char **argv)
// Starting the dameon
QProcess::startDetached(
- KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd",
+ KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd5",
{"start-daemon"}
);
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 46ef942..dd976c3 100644 index 38e6e2b..fb762e5 100644
--- a/src/service/CMakeLists.txt --- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt
@@ -60,9 +60,9 @@ qt5_add_dbus_adaptor ( @@ -60,9 +60,9 @@ qt5_add_dbus_adaptor (