Accepting request 579154 from KDE:Frameworks5

Plasma 5.12.2

OBS-URL: https://build.opensuse.org/request/show/579154
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=85
This commit is contained in:
Dominique Leuenberger 2018-02-28 18:59:14 +00:00 committed by Git OBS Bridge
commit 91214a15e2
5 changed files with 40 additions and 26 deletions

View File

@ -1,8 +1,8 @@
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 54e28501..0eadd042 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -297,7 +297,7 @@ if test $? -ne 0; then
Index: plasma-workspace-5.12.2/startkde/startkde.cmake
===================================================================
--- plasma-workspace-5.12.2.orig/startkde/startkde.cmake
+++ plasma-workspace-5.12.2/startkde/startkde.cmake
@@ -294,7 +294,7 @@ if test $? -ne 0; then
exit 1
fi
@ -11,7 +11,7 @@ index 54e28501..0eadd042 100644
# finally, give the session control to the session manager
# see kdebase/ksmserver for the description of the rest of the startup sequence
@@ -330,13 +330,13 @@ if test x"$wait_drkonqi"x = x"true"x ; then
@@ -327,13 +327,13 @@ if test x"$wait_drkonqi"x = x"true"x ; t
# wait for remaining drkonqi instances with timeout (in seconds)
wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
wait_drkonqi_counter=0
@ -28,10 +28,10 @@ index 54e28501..0eadd042 100644
done
break
fi
diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
index a5d09fa7..b67c41e4 100644
--- a/startkde/startplasma.cmake
+++ b/startkde/startplasma.cmake
Index: plasma-workspace-5.12.2/startkde/startplasma.cmake
===================================================================
--- plasma-workspace-5.12.2.orig/startkde/startplasma.cmake
+++ plasma-workspace-5.12.2/startkde/startplasma.cmake
@@ -140,7 +140,7 @@ if test $? -ne 0; then
exit 1
fi
@ -41,7 +41,7 @@ index a5d09fa7..b67c41e4 100644
# finally, give the session control to the session manager
# see kdebase/ksmserver for the description of the rest of the startup sequence
@@ -169,13 +169,13 @@ if test x"$wait_drkonqi"x = x"true"x ; then
@@ -169,13 +169,13 @@ if test x"$wait_drkonqi"x = x"true"x ; t
# wait for remaining drkonqi instances with timeout (in seconds)
wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
wait_drkonqi_counter=0
@ -58,10 +58,10 @@ index a5d09fa7..b67c41e4 100644
done
break
fi
diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
index 8ac47aa7..377a46f3 100644
--- a/startkde/startplasmacompositor.cmake
+++ b/startkde/startplasmacompositor.cmake
Index: plasma-workspace-5.12.2/startkde/startplasmacompositor.cmake
===================================================================
--- plasma-workspace-5.12.2.orig/startkde/startplasmacompositor.cmake
+++ plasma-workspace-5.12.2/startkde/startplasmacompositor.cmake
@@ -120,12 +120,12 @@ fi
# Get a property value from org.freedesktop.locale1
@ -90,11 +90,11 @@ index 8ac47aa7..377a46f3 100644
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
exit 1
fi
diff --git a/wallpapers/image/wallpaper.knsrc b/wallpapers/image/wallpaper.knsrc
index 13f52321..96c6e359 100644
--- a/wallpapers/image/wallpaper.knsrc
+++ b/wallpapers/image/wallpaper.knsrc
@@ -42,4 +42,4 @@ Categories=KDE Wallpaper 800x600,KDE Wallpaper 1024x768,KDE Wallpaper 1280x1024,
Index: plasma-workspace-5.12.2/wallpapers/image/wallpaper.knsrc
===================================================================
--- plasma-workspace-5.12.2.orig/wallpapers/image/wallpaper.knsrc
+++ plasma-workspace-5.12.2/wallpapers/image/wallpaper.knsrc
@@ -42,4 +42,4 @@ Categories=KDE Wallpaper 800x600,KDE Wal
StandardResource=wallpaper
Uncompress=archive

View File

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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2d7e45761730c7eecbb91a6951c9ae3a4d08dc0a5a80fec640cc1cbfe2569dec
size 4561168

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Feb 21 23:57:10 CET 2018 - lbeltrame@kde.org
- Update to 5.12.2
* New bugfix release
* For more details please see:
* https://www.kde.org/announcements/plasma-5.12.2.php
- Changes since 5.12.1:
* Fix favicons in firefox bookmarks runner (kde#363136)
* Remove uninstalled themerc files for no longer existing Qt themes
* Have all krunner plugin desktop files prefixed with "plasma-runner-"
- Refreshed patches:
* 0001-Rename-qdbus-in-startkde.patch
-------------------------------------------------------------------
Tue Feb 13 16:25:29 CET 2018 - fabian@ritter-vogt.de
@ -93,7 +107,7 @@ Thu Nov 30 10:46:20 CET 2017 - fabian@ritter-vogt.de
-------------------------------------------------------------------
Thu Nov 23 13:52:44 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
@ -397,7 +411,7 @@ Thu May 11 20:26:32 CEST 2017 - fabian@ritter-vogt.de
-------------------------------------------------------------------
Thu Apr 27 21:06:41 UTC 2017 - lbeltrame@kde.org
- Add upstream patch revert-autostart-krun.patch:
- Add upstream patch revert-autostart-krun.patch:
* Fix Plasma start if a non existent executable was supplied as
autostart script / program

View File

@ -27,7 +27,7 @@ Name: plasma5-workspace
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
# Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
%{!?_plasma5_version: %global _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
Version: 5.12.1
Version: 5.12.2
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0+