Accepting request 340669 from KDE:Frameworks5

- Make sure users have pam_unix module in place so the screenlocker
  works when upgrading from openSUSE < 12.3 (boo#931296)

- Try to fix wrong image scaling in kspash (boo#950799): rb125743.patch

OBS-URL: https://build.opensuse.org/request/show/340669
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=27
This commit is contained in:
Dominique Leuenberger 2015-10-28 16:16:27 +00:00 committed by Git OBS Bridge
commit 5b27005505
3 changed files with 32 additions and 1 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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
- Try to fix wrong image scaling in kspash (boo#950799): rb125743.patch
-------------------------------------------------------------------
Sun Oct 18 16:21:21 UTC 2015 - hrvoje.senjan@gmail.com

View File

@ -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
@ -76,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
@ -97,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
@ -201,6 +204,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
@ -213,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

12
rb125743.patch Normal file
View File

@ -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