From 800c8b6a3e61555e9f6bbda8a88ac387cb64f233be790d5dd125bbec22e5af34 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 21 Oct 2015 18:57:05 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=120 --- plasma5-workspace.changes | 5 +++++ plasma5-workspace.spec | 2 ++ rb125743.patch | 12 ++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 rb125743.patch diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 1726f9f..cb583b6 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 21 18:58:15 UTC 2015 - hrvoje.senjan@gmail.com + +- Try to fix wrong image scaling in kspash (boo#950799): rb125743.patch + ------------------------------------------------------------------- Sun Oct 18 16:21:21 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 5b724d9..290d1b9 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -33,6 +33,7 @@ Patch0: 0001-Rename-qdbus-in-startkde.patch Patch1: create_kdehome.patch # PATCH-FIX_OPENSUSE fix-wayland-requirement.patch alarrosa@suse.com -- Change wayland requirement from 1.3.0 to 1.2.1 Patch2: fix-wayland-requirement.patch +Patch3: rb125743.patch # PATCHES 100-200 and above are from upstream 5.3 branch # PATCHES 201-300 and above are from upstream master/5.4 branch @@ -201,6 +202,7 @@ workspace. Development files. %if 0%{?suse_version} == 1315 && ! 0%{?is_opensuse} %patch2 -p1 %endif +%patch3 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 diff --git a/rb125743.patch b/rb125743.patch new file mode 100644 index 0000000..b1cbd1e --- /dev/null +++ b/rb125743.patch @@ -0,0 +1,12 @@ +diff --git a/lookandfeel/contents/splash/Splash.qml b/lookandfeel/contents/splash/Splash.qml +index fdeb1ea..b783263 100644 +--- a/lookandfeel/contents/splash/Splash.qml ++++ b/lookandfeel/contents/splash/Splash.qml +@@ -22,6 +22,7 @@ import QtQuick 2.2 + Image { + id: root + source: "../components/artwork/background.png" ++ fillMode: Image.PreserveAspectFit + + property int stage + From cea50b35944b18234907ea117303d087a8b029963171403e8e74369502a51cf6 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 23 Oct 2015 19:09:25 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=121 --- plasma5-workspace.changes | 6 ++++++ plasma5-workspace.spec | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index cb583b6..11e8c7b 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 23 19:12:41 UTC 2015 - hrvoje.senjan@gmail.com + +- Make sure users have pam_unix module in place so the screenlocker + works when upgrading from openSUSE < 12.3 (boo#931296) + ------------------------------------------------------------------- Wed Oct 21 18:58:15 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 290d1b9..95ff959 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -77,6 +77,7 @@ BuildRequires: wayland-devel >= 1.2.1 %else BuildRequires: wayland-devel >= 1.3.0 %endif +BuildRequires: pam-config BuildRequires: xz BuildRequires: pkgconfig(Qt5Concurrent) >= 5.4.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0 @@ -98,6 +99,7 @@ BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(zlib) +Requires(post): pam-config Conflicts: kdebase4-workspace < 5.3.0 # Some files have been moved from kio-extras5 to plasma5-workspace in 5.4. This should prevent a possible file conflict. (boo#944656) Conflicts: kio-extras5 < 15.08.0 @@ -215,7 +217,11 @@ workspace. Development files. # we have a separate package for Plasma5 session rm -rfv %{buildroot}%{_kf5_sharedir}/xsessions -%post -p /sbin/ldconfig +%post +# boo#931296 +/usr/sbin/pam-config -d --unix2 || : +/usr/sbin/pam-config -a --unix || : +/sbin/ldconfig %postun -p /sbin/ldconfig