Accepting request 306006 from KDE:Frameworks5

Update to 5.10.0.

OBS-URL: https://build.opensuse.org/request/show/306006
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kactivities5?expand=0&rev=16
This commit is contained in:
Stephan Kulow 2015-05-11 17:35:55 +00:00 committed by Git OBS Bridge
commit 18a747597d
5 changed files with 36 additions and 15 deletions

View File

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

View File

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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sun May 3 19:46:55 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.10.0
* For more details please see:
https://www.kde.org/announcements/kde-frameworks-5.10.0.php
- Added pkgconfig(Qt5Quick) >= 5.2.0 BuildRequires
-------------------------------------------------------------------
Sun Apr 26 00:04:45 UTC 2015 - hrvoje.senjan@gmail.com
- Obsolete kactivities4 for openSUSE > 13.2
- Apply kamd-rename.patch for <= 13.2
-------------------------------------------------------------------
Sat Apr 4 14:40:46 UTC 2015 - hrvoje.senjan@gmail.com

View File

@ -18,9 +18,9 @@
%bcond_without lang
%define lname libKF5Activities5
%define _tar_path 5.9
%define _tar_path 5.10
Name: kactivities5
Version: 5.9.0
Version: 5.10.0
Release: 0
%define kf5_version %{version}
Summary: KDE Plasma Activities support
@ -52,12 +52,17 @@ BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0
BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0
BuildRequires: pkgconfig(Qt5Qml) >= 5.2.0
BuildRequires: pkgconfig(Qt5Quick) >= 5.2.0
BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
Recommends: %{name}-imports = %{version}
# for kactivitymanagerd_plugin_sqlite.so
Recommends: libQt5Sql5-sqlite
%if 0%{?suse_version} > 1320
Provides: kactivities4 = %{version}
Obsoletes: kactivities4 < %{version}
%endif
#Conflicts: kactivities4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -96,7 +101,9 @@ Development files.
%lang_package -n %lname
%prep
%setup -q -n kactivities-%{version}
%if 0%{?suse_version} <= 1320
%patch0 -p1
%endif
%build
%if 0%{?suse_version} == 1310
@ -124,7 +131,7 @@ Development files.
%files
%defattr(-,root,root)
%{_kf5_bindir}/kactivitymanagerd5
%{_kf5_bindir}/kactivitymanagerd*
%{_kf5_plugindir}/
%{_kf5_servicesdir}/
%{_kf5_servicetypesdir}/

View File

@ -12,10 +12,10 @@ index 664dc93..0a3f281 100644
diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp
index 09003c1..984c910 100644
index 6c6130b..ac17bf0 100644
--- a/src/lib/core/manager_p.cpp
+++ b/src/lib/core/manager_p.cpp
@@ -64,11 +64,11 @@ Manager *Manager::self()
@@ -72,11 +72,11 @@ Manager *Manager::self()
->property("org.kde.KActivities.core.disableAutostart")
.toBool()) {
qCDebug(KAMD_CORELIB) << "Starting the activity manager daemon";
@ -30,10 +30,10 @@ index 09003c1..984c910 100644
}
diff --git a/src/service/Application.cpp b/src/service/Application.cpp
index eef0eb4..6e2f7d7 100644
index ec74daa..83dbf86 100644
--- a/src/service/Application.cpp
+++ b/src/service/Application.cpp
@@ -360,7 +360,7 @@ int main(int argc, char **argv)
@@ -364,7 +364,7 @@ int main(int argc, char **argv)
// Starting the dameon
QProcess::startDetached(
@ -43,10 +43,10 @@ index eef0eb4..6e2f7d7 100644
);
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 68ad30b..750a85d 100644
index 5c8ecc5..adf72b4 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -63,9 +63,9 @@ qt5_add_dbus_adaptor (
@@ -64,9 +64,9 @@ qt5_add_dbus_adaptor (
Features.h Features
)
@ -57,8 +57,8 @@ index 68ad30b..750a85d 100644
+target_link_libraries (kactivitymanagerd5
Qt5::Core
Qt5::DBus
Qt5::Widgets
@@ -85,7 +85,7 @@ install (FILES
Qt5::Gui
@@ -86,7 +86,7 @@ install (FILES
)
install (TARGETS
@ -68,7 +68,7 @@ index 68ad30b..750a85d 100644
install (FILES
diff --git a/src/service/files/kactivitymanagerd.desktop b/src/service/files/kactivitymanagerd.desktop
index b3d698f..a662bcf 100644
index 710f09d..c1a45e3 100644
--- a/src/service/files/kactivitymanagerd.desktop
+++ b/src/service/files/kactivitymanagerd.desktop
@@ -4,7 +4,7 @@ Icon=preferences-activities