5.4.2

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

fix-logout-button-sizing.patch

@@ -1,30 +0,0 @@
-From: Aleix Pol <aleixpol@kde.org>
-Date: Tue, 15 Sep 2015 09:16:16 +0000
-Subject: Make sure the cancel and shutdown/logout button have the same size
-X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=93bf81eea152e2b8261ac4a854207af448ed7c43
----
-Make sure the cancel and shutdown/logout button have the same size
-
-REVIEW: 125235
----
-
-
---- a/lookandfeel/contents/components/LogoutScreen.qml
-+++ b/lookandfeel/contents/components/LogoutScreen.qml
-@@ -130,12 +130,15 @@
-             anchors.centerIn: parent
- 
-             PlasmaComponents.Button {
-+                id: cancelButton
-                 text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Cancel")
-                 onClicked: root.cancel()
-+                Layout.preferredWidth: Math.max(commitButton.implicitWidth, cancelButton.implicitWidth)
-             }
- 
-             PlasmaComponents.Button {
-                 id: commitButton
-+                Layout.preferredWidth: Math.max(commitButton.implicitWidth, cancelButton.implicitWidth)
-                 onClicked: root.currentAction()
-                 focus: true
- 
-

plasma-workspace-5.4.1.tar.xz

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

plasma-workspace-5.4.2.tar.xz

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

plasma5-workspace.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Oct  4 10:44:29 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.4.2:
+  * For more details please see:
+    https://www.kde.org/announcements/plasma-5.4.2.php
+- Drop fix-logout-button-sizing.patch, upstreamed
+
 -------------------------------------------------------------------
 Wed Sep 16 18:39:29 UTC 2015 - lbeltrame@kde.org
 

plasma5-workspace.spec

@@ -18,7 +18,7 @@
 
 %bcond_without lang
 Name:           plasma5-workspace
-Version:        5.4.1
+Version:        5.4.2
 Release:        0
 Summary:        The KDE Plasma Workspace Components
 License:        GPL-2.0+
@@ -31,8 +31,6 @@ Source99:       %{name}-rpmlintrc
 Patch0:         0001-Rename-qdbus-in-startkde.patch
 # PATCH-FIX_OPENSUSE create_kdehome.patch -- https://bugs.kde.org/show_bug.cgi?id=338422#c8
 Patch1:         create_kdehome.patch
-# PATCH-FIX-UPSTREAM: fix-logout-button-sizing.patch lbeltrame@kde.org -- Ensure all logout buttons have the same size
-Patch2:         fix-logout-button-sizing.patch
 # PATCHES 100-200 and above are from upstream 5.3 branch
 # PATCHES 201-300 and above are from upstream master/5.4 branch
 
@@ -192,7 +190,6 @@ workspace. Development files.
 %setup -q -n plasma-workspace-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
   %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5