From 102aff510b38b059ee84e1aa4ac78f25c28b1413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Tue, 26 May 2015 00:33:58 +0200 Subject: [PATCH] Plasma 5.3.1 --- .gitignore | 1 + ...s-update-scripts-after-first-initialization.patch | 12 ------------ plasma-workspace.spec | 10 ++++++---- sources | 2 +- 4 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 plasma-workspace-5.3.0-process-update-scripts-after-first-initialization.patch diff --git a/.gitignore b/.gitignore index 3595a89..4a43b16 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /plasma-workspace-5.2.2.tar.xz /plasma-workspace-5.2.95.tar.xz /plasma-workspace-5.3.0.tar.xz +/plasma-workspace-5.3.1.tar.xz diff --git a/plasma-workspace-5.3.0-process-update-scripts-after-first-initialization.patch b/plasma-workspace-5.3.0-process-update-scripts-after-first-initialization.patch deleted file mode 100644 index 68a96fa..0000000 --- a/plasma-workspace-5.3.0-process-update-scripts-after-first-initialization.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp -index 4aff26e..864e78a 100644 ---- a/shell/shellcorona.cpp -+++ b/shell/shellcorona.cpp -@@ -306,6 +306,7 @@ void ShellCorona::load() - checkActivities(); - if (containments().isEmpty()) { - loadDefaultLayout(); -+ processUpdateScripts(); - } else { - processUpdateScripts(); - foreach(Plasma::Containment *containment, containments()) { diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 41cc566..9456ff1 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -3,8 +3,8 @@ #%define bootstrap 1 Name: plasma-workspace -Version: 5.3.0 -Release: 8%{?dist} +Version: 5.3.1 +Release: 1%{?dist} Summary: Plasma workspace, applications and applets License: GPLv2+ URL: https://projects.kde.org/projects/kde/workspace/plasma-workspace @@ -27,7 +27,7 @@ Source12: metadata.desktop ## downstream Patches Patch10: plasma-workspace-5.3.0-konsole-in-contextmenu.patch Patch11: plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch -Patch12: plasma-workspace-5.3.0-process-update-scripts-after-first-initialization.patch + ## upstreamable Patches @@ -206,7 +206,6 @@ Documentation and user manuals for %{name}. %if 0%{?fedora} > 21 %patch11 -p1 -b .set-fedora-default-look-and-feel %endif -%patch12 -p1 -b .process-update-scripts-after-first-initialization mv startkde/startkde.cmake startkde/startkde.cmake.orig install -m644 -p %{SOURCE11} startkde/startkde.cmake @@ -319,6 +318,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/{plasma-windowed,org %changelog +* Tue May 26 2015 Daniel Vrátil - 5.3.1-1 +- Plasma 5.3.1 + * Wed May 20 2015 Jan Grulich - 5.3.0-8 - apply the new patch for update scripts execution diff --git a/sources b/sources index e43b77f..51c65ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4085a9bdd87706beeccfcc7dd09d5b85 plasma-workspace-5.3.0.tar.xz +d76be06fa53bad880c2a1c5102f02b5b plasma-workspace-5.3.1.tar.xz