diff --git a/gdm.changes b/gdm.changes index 77287f4..c56e7a4 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Nov 11 18:39:36 UTC 2012 - dimstar@opensuse.org + +- Fix useradd invocation: -o is useless without -u and newer + versions of pwdutils/shadowutils fail on this now. + +------------------------------------------------------------------- +Thu Nov 8 18:57:37 UTC 2012 - dimstar@opensuse.org + +- Switch on systemd support: change with_systemd defines to 1. + ------------------------------------------------------------------- Tue Oct 16 07:10:36 UTC 2012 - dimstar@opensuse.org diff --git a/gdm.spec b/gdm.spec index ae614b1..8d43634 100644 --- a/gdm.spec +++ b/gdm.spec @@ -19,7 +19,10 @@ # We can enable systemd support only if we have xorg 1.12, as it means # starting X with --seat, and only if we build the whole system with # systemd support (for instance, NetworkManager). -%define with_systemd 0 +%define with_systemd 1 +%if %{with_systemd} +%define systemdsystemunitdir %(pkg-config --variable=systemdsystemunitdir systemd) +%endif # FIXME: need to check what should be done to enable this (at least adapt the pam files). See bnc#699999 %define enable_split_authentication 0 @@ -312,7 +315,7 @@ rm -rf $RPM_BUILD_ROOT %pre /usr/sbin/groupadd -r gdm 2> /dev/null || : -/usr/sbin/useradd -r -o -g gdm -G video -s /bin/false \ +/usr/sbin/useradd -r -g gdm -G video -s /bin/false \ -c "Gnome Display Manager daemon" -d /var/lib/gdm gdm 2> /dev/null || : /usr/sbin/usermod -g gdm -G video -s /bin/false gdm 2> /dev/null # Fix incorrect interpretation of DISPLAYMANAGER_PASSWORD_LESS_LOGIN (#307566). @@ -424,6 +427,9 @@ dconf update %{_datadir}/gdm/simple-greeter/extensions/password/ %{_libdir}/gdm/simple-greeter/extensions/libpassword.so %endif +%if %{with_systemd} +%{systemdsystemunitdir}/gdm.service +%endif %if %{enable_split_authentication}