Accepting request 290568 from KDE:Frameworks5

Update to 5.8.0.

OBS-URL: https://build.opensuse.org/request/show/290568
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kactivities5?expand=0&rev=14

kactivities-5.7.0.tar.xz

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

kactivities-5.8.0.tar.xz

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

kactivities5.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Mar  7 16:58:47 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.8.0
+  * Resources scoring service is now finalized
+  * For more details please see:
+    https://www.kde.org/announcements/kde-frameworks-5.8.0.php
+
 -------------------------------------------------------------------
 Sun Feb  8 18:15:18 UTC 2015 - hrvoje.senjan@gmail.com
 

kactivities5.spec

@@ -17,7 +17,7 @@
 
 
 %define lname   libKF5Activities5
-%define _tar_path 5.7
+%define _tar_path 5.8
 Name:           kactivities5
 Version:        %{_tar_path}.0
 Release:        0
@@ -32,7 +32,7 @@ Source1:        baselibs.conf
 Patch0:         kamd-rename.patch
 BuildRequires:  boost-devel >= 1.49.0
 BuildRequires:  cmake >= 2.8.12
-BuildRequires:  extra-cmake-modules >= 1.7.0
+BuildRequires:  extra-cmake-modules >= 1.8.0
 BuildRequires:  fdupes
 BuildRequires:  kcmutils-devel >= %{kf5_version}
 BuildRequires:  kconfig-devel >= %{kf5_version}

kamd-rename.patch

@@ -1,8 +1,8 @@
-diff --git a/autotests/Process.cpp b/autotests/Process.cpp
+diff --git a/autotests/core/Process.cpp b/autotests/core/Process.cpp
-index a7a0507..afa4bf1 100644
+index 664dc93..0a3f281 100644
---- a/autotests/Process.cpp
+--- a/autotests/core/Process.cpp
-+++ b/autotests/Process.cpp
++++ b/autotests/core/Process.cpp
-@@ -83,7 +83,7 @@ void Modifier::initTestCase()
+@@ -85,7 +85,7 @@ void Modifier::initTestCase()
              // qDebug() << env;
  
              s_process->setEnvironment(env);
@@ -12,10 +12,10 @@ index a7a0507..afa4bf1 100644
  
  
 diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp
-index 077c634..7be66dd 100644
+index 09003c1..984c910 100644
 --- a/src/lib/core/manager_p.cpp
 +++ b/src/lib/core/manager_p.cpp
-@@ -94,11 +94,11 @@ Manager *Manager::self()
+@@ -64,11 +64,11 @@ Manager *Manager::self()
                           ->property("org.kde.KActivities.core.disableAutostart")
                           .toBool()) {
                      qCDebug(KAMD_CORELIB) << "Starting the activity manager daemon";
@@ -30,19 +30,10 @@ index 077c634..7be66dd 100644
              }
  
 diff --git a/src/service/Application.cpp b/src/service/Application.cpp
-index 6b0e3e1..3894540 100644
+index eef0eb4..6e2f7d7 100644
 --- a/src/service/Application.cpp
 +++ b/src/service/Application.cpp
-@@ -280,7 +280,7 @@ int main(int argc, char **argv)
+@@ -360,7 +360,7 @@ int main(int argc, char **argv)
-     application.setApplicationName(QStringLiteral("ActivityManager"));
-     application.setOrganizationDomain(QStringLiteral("kde.org"));
- 
--    // KAboutData about("kactivitymanagerd", Q_NULLPTR, ki18n("KDE Activity Manager"), "3.0",
-+    // KAboutData about("kactivitymanagerd5", Q_NULLPTR, ki18n("KDE Activity Manager"), "3.0",
-     //         ki18n("KDE Activity Management Service"),
-     //         KAboutData::License_GPL,
-     //         ki18n("(c) 2010, 2011, 2012 Ivan Cukic"), KLocalizedString(),
-@@ -333,7 +333,7 @@ int main(int argc, char **argv)
          // Starting the dameon
  
          QProcess::startDetached(
@@ -52,10 +43,10 @@ index 6b0e3e1..3894540 100644
              );
  
 diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
-index 4b4978b..2220f34 100644
+index 68ad30b..750a85d 100644
 --- a/src/service/CMakeLists.txt
 +++ b/src/service/CMakeLists.txt
-@@ -62,9 +62,9 @@ qt5_add_dbus_adaptor (
+@@ -63,9 +63,9 @@ qt5_add_dbus_adaptor (
     Features.h Features
     )
  
@@ -67,7 +58,7 @@ index 4b4978b..2220f34 100644
     Qt5::Core
     Qt5::DBus
     Qt5::Widgets
-@@ -84,7 +84,7 @@ install (FILES
+@@ -85,7 +85,7 @@ install (FILES
     )
  
  install (TARGETS
@@ -77,7 +68,7 @@ index 4b4978b..2220f34 100644
  
  install (FILES
 diff --git a/src/service/files/kactivitymanagerd.desktop b/src/service/files/kactivitymanagerd.desktop
-index be5faa1..3c9b9a9 100644
+index b3d698f..a662bcf 100644
 --- a/src/service/files/kactivitymanagerd.desktop
 +++ b/src/service/files/kactivitymanagerd.desktop
 @@ -4,7 +4,7 @@ Icon=preferences-activities