commit kdebase4-workspace for openSUSE:Factory
Hello community,
here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2014-09-28 19:56:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2014-09-08 21:29:03.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2014-09-28 19:56:35.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Sep 22 19:30:45 UTC 2014 - tittiatcoke@gmail.com
+
+- Make kactivities4 a hard requirement (bnc#896660)
+
+-------------------------------------------------------------------
+Sat Sep 13 16:20:45 UTC 2014 - tittiatcoke@gmail.com
+
+- Update to 4.11.12
+ * KDE 4.14.1 SC Bugfix Release
+ * See http://www.kde.org/announcements/announce-4.14.1.php
+- Drop upstream patch
+ changeset_re8241313fc979aefafc8c2a0207570d6394f1580.diff
+
+-------------------------------------------------------------------
Old:
----
changeset_re8241313fc979aefafc8c2a0207570d6394f1580.diff
kde-workspace-4.11.11.tar.xz
New:
----
kde-workspace-4.11.12.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.DcdxF8/_old 2014-09-28 19:56:37.000000000 +0200
+++ /var/tmp/diff_new_pack.DcdxF8/_new 2014-09-28 19:56:37.000000000 +0200
@@ -19,7 +19,7 @@
%define with_multiseat 1
Name: kdebase4-workspace
-Version: 4.11.11
+Version: 4.11.12
Release: 0
Summary: The KDE Workspace Components
License: GPL-2.0+
@@ -128,8 +128,6 @@
Patch59: krunner-no-italics.diff
# PATCH-FIX-OPENSUSE plasma-disable-networkmanager.diff -- Makes it possible to disable it on KDE start depending on sysconfig
Patch60: plasma-disable-networkmanager.diff
-# PATCH-FIX-UPSTREAM changeset_re8241313fc979aefafc8c2a0207570d6394f1580.diff -- Require strict binding for intel driver
-Patch61: changeset_re8241313fc979aefafc8c2a0207570d6394f1580.diff
# PATCH-FIX-OPENSUSE opensuse-homepage.diff -- Makes kickoff use openSUSE homepage as default
Patch62: opensuse-homepage.diff
# PATCH-FIX-OPENSUSE opensuse-kinfocenter.diff (created by Alin M. Elena to have some openSUSE distro info in kinfocenter)
@@ -150,7 +148,7 @@
Requires: %{name}-liboxygenstyle = %{version}
# Requires /etc/xdg/menus/applications.menu (bnc#754104)
Requires: desktop-data-openSUSE
-Recommends: kactivities4 >= %{_kde_platform_version}
+Requires: kactivities4 >= 4.13.3
Requires: kde4-kgreeter-plugins = %{version}
Requires: kscreen
Requires: polkit-kde-agent-1
@@ -383,7 +381,6 @@
%patch57
%patch59 -p1
%patch60 -p1
-%patch61 -p1
%patch62 -p1
%patch63 -p1
%patch64 -p1
++++++ kde-workspace-4.11.11.tar.xz -> kde-workspace-4.11.12.tar.xz ++++++
/work/SRC/openSUSE:Factory/kdebase4-workspace/kde-workspace-4.11.11.tar.xz /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kde-workspace-4.11.12.tar.xz differ: char 27, line 1
++++++ opensuse-kinfocenter.diff ++++++
--- /var/tmp/diff_new_pack.DcdxF8/_old 2014-09-28 19:56:37.000000000 +0200
+++ /var/tmp/diff_new_pack.DcdxF8/_new 2014-09-28 19:56:37.000000000 +0200
@@ -1,8 +1,7 @@
-diff --git a/kinfocenter/Modules/infosummary/infosum.cpp b/kinfocenter/Modules/infosummary/infosum.cpp
-index 276d00c..c36c311 100644
---- a/kinfocenter/Modules/infosummary/infosum.cpp
-+++ b/kinfocenter/Modules/infosummary/infosum.cpp
-@@ -58,12 +58,12 @@ void InfoSumPlugin::createDisplay()
+diff -urB kde-workspace-4.11.12/kinfocenter/Modules/infosummary/infosum.cpp new/kinfocenter/Modules/infosummary/infosum.cpp
+--- kde-workspace-4.11.12/kinfocenter/Modules/infosummary/infosum.cpp 2014-09-12 09:42:16.000000000 +0200
++++ new/kinfocenter/Modules/infosummary/infosum.cpp 2014-09-14 09:41:12.275783695 +0200
+@@ -58,12 +58,12 @@
void InfoSumPlugin::createOsBox()
{
DefaultBoxWidget *osWidget = new DefaultBoxWidget();
@@ -15,14 +14,41 @@
- osWidget->setLabelOne(osInfo->osVersion());
+ osWidget->setLabelOne(osInfo->osVersion()+'\n'+osInfo->distroName());
- osWidget->setLabelTwo(QString(KDE_VERSION_STRING));
+ osWidget->setLabelTwo(QString(KDE::versionString()));
osWidget->setLabelThree(osInfo->hostName());
osWidget->setWhatsThis(i18nc("OS whats this","This shows information about your Operating System"));
-diff --git a/kinfocenter/Modules/infosummary/osdepinfo.cpp b/kinfocenter/Modules/infosummary/osdepinfo.cpp
-index 34afecc..af1ec45 100644
---- a/kinfocenter/Modules/infosummary/osdepinfo.cpp
-+++ b/kinfocenter/Modules/infosummary/osdepinfo.cpp
-@@ -37,6 +37,12 @@ const QString OsDepInfo::osVersion()
+diff -urB kde-workspace-4.11.12/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp new/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp
+--- kde-workspace-4.11.12/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp 2014-09-12 09:42:16.000000000 +0200
++++ new/kinfocenter/Modules/infosummary/osdepinfo_unix.cpp 2014-09-14 09:39:42.238790434 +0200
+@@ -23,6 +23,18 @@
+ #include "osdepinfo.h"
+
+ #include
participants (1)
-
root@hilbert.suse.de