diff --git a/sddm.spec b/sddm.spec index 653c7e5..f766529 100644 --- a/sddm.spec +++ b/sddm.spec @@ -1,7 +1,7 @@ %define user_sddm 68 %define group_sddm 68 Name: sddm -Version: 0.17.0 +Version: 0.18.0 Release: 2mamba Summary: QML based X11 and Wayland display manager Group: Graphical Desktop/Applications/Environment @@ -36,7 +36,7 @@ QML based X11 and Wayland display manager. %prep %setup -q %patch0 -p1 -%patch1 -p1 +#%patch1 -p1 %build %cmake -d build @@ -48,6 +48,9 @@ QML based X11 and Wayland display manager. install -d -m0775 %{buildroot}%{_localstatedir}/lib/sddm +install -d -m0755 %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d +%{buildroot}%{_bindir}/sddm --example-config > %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d/default.conf + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -71,7 +74,16 @@ useradd -u %{user_sddm} -g sddm \ %posttrans if [ $1 -ge 1 ]; then - if [ -e /opt/kde/share/config/kdm/kdmrc ]; then + [ -e /etc/sddm.conf.rpmsave ] && { + eval `grep ^User= /etc/sddm.conf.rpmsave` + } + [ -e /etc/sddm.conf ] || { + cat > /etc/sddm.conf << _EOF +[Autologin] +User=${User} +_EOF + } + if [ -e /opt/kde/share/config/kdm/kdmrc -a ! "${User}" ]; then # Keep autologin when upgrading from KDM KDM_AUTOLOGIN=`grep "^AutoLoginUser=" /opt/kde/share/config/kdm/kdmrc| sed "s|AutoLoginUser=||"` if [ "${KDM_AUTOLOGIN}" ]; then @@ -87,10 +99,12 @@ fi %{_sysconfdir}/pam.d/sddm %{_sysconfdir}/pam.d/sddm-autologin %{_sysconfdir}/pam.d/sddm-greeter -%config(noreplace) %{_sysconfdir}/sddm.conf +#%config(noreplace) %{_sysconfdir}/sddm.conf %{_unitdir}/sddm.service %{_bindir}/sddm %{_bindir}/sddm-greeter +%dir %{_prefix}/lib/sddm/sddm.conf.d +%{_prefix}/lib/sddm/sddm.conf.d/default.conf %dir %{_libdir}/qt5/qml/SddmComponents %{_libdir}/qt5/qml/SddmComponents/* %{_prefix}/libexec/sddm-helper @@ -114,6 +128,12 @@ fi %doc LICENSE %changelog +* Wed Sep 05 2018 Silvan Calarco 0.18.0-2mamba +- reconfigure autologin user after upgrade + +* Sat Sep 01 2018 Automatic Build System 0.18.0-1mamba +- automatic version update by autodist + * Sun Apr 08 2018 Silvan Calarco 0.17.0-2mamba - added upstream patch and pam configuration to fix support for pam_groups