Accepting request 560187 from home:Vogtinator:branches:KDE:Frameworks5

- Add patch to add a note to use YaST for autologin configuration:
  * 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch
- Run spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/560187
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcm_sddm?expand=0&rev=133
This commit is contained in:
Luca Beltrame 2017-12-29 13:20:21 +00:00 committed by Git OBS Bridge
parent b37a0c0c89
commit 05481335ec
3 changed files with 56 additions and 8 deletions

View File

@ -0,0 +1,41 @@
From 54594141b22474cfc1a0dc3f57258a60706e54c0 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 27 Dec 2017 18:54:36 +0100
Subject: [PATCH] Replace autologin configuration with a note to use YaST
instead
sddm looks at sysconfig for autologin and ignores other configuration files.
---
src/ui/advanceconfig.ui | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/ui/advanceconfig.ui b/src/ui/advanceconfig.ui
index 7fe00b1..4ec219d 100644
--- a/src/ui/advanceconfig.ui
+++ b/src/ui/advanceconfig.ui
@@ -45,15 +45,19 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
- <item row="0" column="0">
+ <item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_7">
<property name="text">
- <string>User:</string>
+ <string>Autologin needs to be configured using YaST or by editing /etc/sysconfig/displaymanager.</string>
</property>
</widget>
</item>
<item row="0" column="1">
- <widget class="QComboBox" name="userList"/>
+ <widget class="QComboBox" name="userList">
+ <property name="visible">
+ <bool>false</bool>
+ </property>
+ </widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
--
2.15.0

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 27 18:06:23 UTC 2017 - fabian@ritter-vogt.de
- Add patch to add a note to use YaST for autologin configuration:
* 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch
- Run spec-cleaner
-------------------------------------------------------------------
Thu Nov 30 10:43:18 CET 2017 - fabian@ritter-vogt.de

View File

@ -18,19 +18,22 @@
%bcond_without lang
Name: kcm_sddm
Version: 5.11.4
Release: 0
Summary: A sddm control module for KDE
License: GPL-2.0
Group: System/GUI/KDE
Version: 5.11.4
Release: 0
Url: https://projects.kde.org/projects/kdereview/sddm-kcm/repository
Source: http://download.kde.org/stable/plasma/%{version}/sddm-kcm-%{version}.tar.xz
# PATCH-FIX-OPENSUSE set-default-session-to-plasma5-for-autologin.patch boo#951886 wbauer@tmo.at -- set the default autologin session to plasma5.desktop
Patch1: set-default-session-to-plasma5-for-autologin.patch
# PATCH-FIX-OPENSUSE
Patch2: 0002-Support-default.session-symlink.patch
# PATCH-FIX-OPENSUSE
Patch3: 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch
BuildRequires: extra-cmake-modules >= 1.0.0
BuildRequires: kf5-filesystem
BuildRequires: pkgconfig
BuildRequires: cmake(KF5Archive)
BuildRequires: cmake(KF5Auth)
BuildRequires: cmake(KF5ConfigWidgets)
@ -50,23 +53,21 @@ BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xcb-image)
BuildRequires: pkgconfig(xcb-shm)
# cmakelists broken upstream, /home/abuild/rpmbuild/BUILD/sddm-kcm-0.0.0.1/src/cursortheme/thememodel.cpp:34:33: fatal error: X11/Xcursor/Xcursor.h: No such file or directory
BuildRequires: pkgconfig(xcursor)
%if %{with lang}
Recommends: %{name}-lang
%endif
Supplements: packageand(sddm:plasma5-workspace)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: %{name}-lang
%description
SDDM control module for KDE. It provides a graphical frontend for the
sddm.
%lang_package
%prep
%setup -q -n sddm-kcm-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%cmake_kf5 -d build
@ -84,7 +85,6 @@ sddm.
%endif
%files
%defattr(-,root,root)
%doc README
%config %{_kf5_configdir}/sddmtheme.knsrc
%{_bindir}/sddmthemeinstaller