Accepting request 236277 from KDE:Frameworks5

4.100.0

OBS-URL: https://build.opensuse.org/request/show/236277
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kactivities5?expand=0&rev=3
This commit is contained in:
Stephan Kulow 2014-06-10 12:36:22 +00:00 committed by Git OBS Bridge
commit 0d3ebf8ede
6 changed files with 43 additions and 9 deletions

3
baselibs.conf Normal file
View File

@ -0,0 +1,3 @@
libKF5Activities5
kactivities5-devel
requires "libKF5Activities5-<targettype> = <version>"

View File

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

View File

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

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sun Jun 1 18:02:24 UTC 2014 - hrvoje.senjan@gmail.com
- Update to 4.100.0
* API improvements and cleanups
* Buildsystem fixes
* For more details please see:
http://www.kde.org/announcements/announce-frameworks5-beta3.php
- Add baselibs.conf
-------------------------------------------------------------------
Tue May 13 18:49:51 UTC 2014 - hrvoje.senjan@gmail.com

View File

@ -18,24 +18,26 @@
%define lname libKF5Activities5
Name: kactivities5
Version: 4.99.0
Version: 4.100.0
Release: 0
Summary: KDE Plasma Activities support
License: GPL-2.0+
Group: System/GUI/KDE
Url: http://projects.kde.org/kactivities
Source0: kactivities-%{version}.tar.xz
Source: http://download.kde.org/unstable/frameworks/%{version}/kactivities-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM kamd-rename.patch -- https://git.reviewboard.kde.org/r/115602/ -- rename kactivitymanagerd binary so it can co-exist with kactivities4
Patch0: kamd-rename.patch
BuildRequires: boost-devel >= 1.49.0
BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules >= 0.0.13
BuildRequires: extra-cmake-modules >= 0.0.14
BuildRequires: fdupes
BuildRequires: kconfig-devel >= %{_kf5_version}
BuildRequires: kcoreaddons-devel >= %{_kf5_version}
BuildRequires: kdbusaddons-devel >= %{_kf5_version}
BuildRequires: kf5-filesystem
BuildRequires: ki18n-devel >= %{_kf5_version}
BuildRequires: kio-devel >= %{_kf5_version}
BuildRequires: kservice-devel >= %{_kf5_version}
BuildRequires: kwindowsystem-devel >= %{_kf5_version}
BuildRequires: xz
@ -56,6 +58,7 @@ Kactivities provides an API for using and interacting with the Plasma Activities
%package -n %lname
Summary: Library for KDE's Plasma Activities support
Group: System/GUI/KDE
Recommends: %lname-lang = %{version}
%description -n %lname
Kactivities provides an API for using and interacting with the Plasma Activities Manager.
@ -64,13 +67,14 @@ Kactivities provides an API for using and interacting with the Plasma Activities
Summary: KDE Base Libraries
Group: Development/Libraries/KDE
Requires: %lname = %{version}
Requires: extra-cmake-modules >= 0.0.13
Requires: kdbusaddons-devel >= %{_kf5_version}
Requires: extra-cmake-modules >= 0.0.14
Requires: pkgconfig(Qt5Core) >= 5.2.0
Obsoletes: kf5-kactivities-devel
%description devel
Provides the interface and basic tools for the KDE workspace.
%lang_package -n %lname
%prep
%setup -q -n kactivities-%{version}
%patch0 -p1
@ -87,10 +91,14 @@ Provides the interface and basic tools for the KDE workspace.
%kf5_makeinstall -C build
%fdupes -s %{buildroot}
%find_lang %{name}
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
%files -n %lname-lang -f %{name}.lang
%files
%defattr(-,root,root)
%{_kf5_bindir}/kactivitymanagerd5

View File

@ -29,8 +29,21 @@ index 2a81ff8..fc653a4 100644
#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
index 46ef942..dd976c3 100644
index 38e6e2b..fb762e5 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -60,9 +60,9 @@ qt5_add_dbus_adaptor (