Hello community,

here is the log from the commit of package lightdm for openSUSE:Factory checked 
in at 2014-02-28 07:23:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lightdm (Old)
 and      /work/SRC/openSUSE:Factory/.lightdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "lightdm"

Changes:
--------
--- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes  2014-02-22 
18:11:20.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes     2014-02-28 
07:23:58.000000000 +0100
@@ -1,0 +2,15 @@
+Thu Feb 27 11:11:54 UTC 2014 - g...@opensuse.org
+
+- only build-depend on Qt5 for >= 13.1
+
+-------------------------------------------------------------------
+Thu Feb 27 00:09:09 UTC 2014 - g...@opensuse.org
+
+- drop support for openSUSE < 12.3
+- do not overwrite lightdm.conf, users.conf, keys.conf by default
+- make use of lightdm.conf.d, put openSUSE-specific configuration
+  in /usr/share/lightdm/lightdm.conf.d and drop
+  lightdm-default-configuration.patch
+- remove useless usermod call
+
+-------------------------------------------------------------------

Old:
----
  lightdm-default-configuration.patch

New:
----
  50-suse-defaults.conf
  users.conf

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lightdm.spec ++++++
--- /var/tmp/diff_new_pack.I6wd3h/_old  2014-02-28 07:23:59.000000000 +0100
+++ /var/tmp/diff_new_pack.I6wd3h/_new  2014-02-28 07:23:59.000000000 +0100
@@ -23,11 +23,7 @@
 %define qt_lib          lib%{qt_libname}-0
 %define qt5_libname     lightdm-qt5-3
 %define qt5_lib         lib%{qt5_libname}-0
-%if 0%{?suse_version} >= 1230
 %define rundir          /run
-%else
-%define rundir          %{_localstatedir}/run
-%endif
 
 Name:           lightdm
 Version:        1.8.7
@@ -40,6 +36,8 @@
 Source1:        %{name}-greeter.pamd
 Source2:        X11-displaymanagers-%{name}
 Source3:        dm-tool.1
+Source4:        50-suse-defaults.conf
+Source5:        users.conf
 Source100:      %{name}-rpmlintrc
 # PATCH-FEATURE-OPENSUSE lightdm-sysconfig-support.patch g...@opensuse.org -- 
Adds support for reading configuration options from 
/etc/sysconfig/displaymanager and /etc/sysconfig/windowmanager
 Patch0:         lightdm-sysconfig-support.patch
@@ -47,8 +45,6 @@
 Patch1:         lightdm-xauthlocalhostname-support.patch
 # PATCH-FEATURE-OPENSUSE lightdm-set-gdmflexiserver-envvar.patch 
g...@opensuse.org -- Sets the GDMFLEXISERVER environment variable for the 
gdmflexiserver wrapper
 Patch2:         lightdm-set-gdmflexiserver-envvar.patch
-# PATCH-FEATURE-OPENSUSE lightdm-default-configuration.patch g...@opensuse.org 
-- Modifies configuration with suitable defaults for openSUSE
-Patch3:         lightdm-default-configuration.patch
 # PATCH-FIX-UPSTREAM lightdm-lock-screen-before-switch.patch g...@opensuse.org 
-- Try to lock the screen before switching users
 Patch4:         lightdm-lock-screen-before-switch.patch
 # PATCH-FIX-OPENSUSE lightdm-disable-utmp-handling.patch g...@opensuse.org -- 
Disable utmp handling since this is handled in the Xstartup/Xreset scripts
@@ -71,9 +67,11 @@
 BuildRequires:  pkgconfig(QtCore)
 BuildRequires:  pkgconfig(QtDBus)
 BuildRequires:  pkgconfig(QtGui)
+%if 0%{?suse_version} >= 1310
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Gui)
+%endif
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcb)
 BuildRequires:  pkgconfig(xdmcp)
@@ -158,12 +156,9 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%if 0%{?suse_version} >= 1230
 %patch6 -p1
-%endif
 
 %build
 %if 0%{?suse_version} >= 1310
@@ -196,30 +191,32 @@
 
 ln -sf %{_sysconfdir}/pam.d/xdm %{buildroot}%{_sysconfdir}/pam.d/lightdm
 ln -sf %{_sysconfdir}/pam.d/xdm-np 
%{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin
-install -D -m 644 -p %{SOURCE1} 
%{buildroot}%{_sysconfdir}/pam.d/lightdm-greeter
-install -D -m 644 -p %{SOURCE2} 
%{buildroot}%{_libexecdir}/X11/displaymanagers/lightdm
-
-install -D -m 644 -p %{SOURCE3} %{buildroot}%{_mandir}/man1/dm-tool.1
 
 install -d %{buildroot}%{_datadir}/lightdm/greeters
-install -d %{buildroot}%{_datadir}/xgreeters
-install -d %{buildroot}%{_datadir}/lightdm/sessions
+install -d %{buildroot}%{_datadir}/lightdm/lightdm.conf.d
 install -d %{buildroot}%{_datadir}/lightdm/remote-sessions
+install -d %{buildroot}%{_datadir}/lightdm/sessions
+install -d %{buildroot}%{_datadir}/xgreeters
+install -d %{buildroot}%{_localstatedir}/cache/lightdm
+install -d %{buildroot}%{_localstatedir}/lib/lightdm
 install -d %{buildroot}%{_localstatedir}/log/lightdm
+install -d %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d
 install -d %{buildroot}%{rundir}/lightdm
-install -d %{buildroot}%{_localstatedir}/lib/lightdm
-install -d %{buildroot}%{_localstatedir}/cache/lightdm
 
-%find_lang %{name} %{?no_lang_C}
+install -D -m 644 -p %{SOURCE1} 
%{buildroot}%{_sysconfdir}/pam.d/lightdm-greeter
+install -D -m 644 -p %{SOURCE2} 
%{buildroot}%{_libexecdir}/X11/displaymanagers/lightdm
+
+install -D -m 644 -p %{SOURCE3} %{buildroot}%{_mandir}/man1/dm-tool.1
 
-%clean
-rm -rf %{buildroot}
+install -D -m 644 -p %{SOURCE4} 
%{buildroot}%{_datadir}/lightdm/lightdm.conf.d/50-suse-defaults.conf
+install -D -m 644 -p %{SOURCE5} %{buildroot}%{_sysconfdir}/lightdm/users.conf
+
+%find_lang %{name} %{?no_lang_C}
 
 %pre
 /usr/sbin/groupadd -r lightdm 2> /dev/null || :
 /usr/sbin/useradd -r -g lightdm -s /bin/false -c "LightDM daemon" \
     -d /var/lib/lightdm lightdm 2> /dev/null || :
-/usr/sbin/usermod -g lightdm -G lightdm -s /bin/false lightdm 2> /dev/null
 
 %post -n %{gobject_lib} -p /sbin/ldconfig
 
@@ -244,10 +241,10 @@
 %{_libexecdir}/%{name}/lightdm-set-defaults
 %{_libexecdir}/%{name}/lightdm-guest-session-wrapper
 %{_libexecdir}/%{name}/gdmflexiserver
-%dir %{_sysconfdir}/lightdm/
-%config %{_sysconfdir}/lightdm/lightdm.conf
-%config %{_sysconfdir}/lightdm/users.conf
-%config %{_sysconfdir}/lightdm/keys.conf
+%{_sysconfdir}/lightdm/
+%config(noreplace) %{_sysconfdir}/lightdm/lightdm.conf
+%config(noreplace) %{_sysconfdir}/lightdm/users.conf
+%config(noreplace) %{_sysconfdir}/lightdm/keys.conf
 %config %{_sysconfdir}/pam.d/lightdm*
 %config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
 %dir %{_libexecdir}/X11/displaymanagers/

++++++ 50-suse-defaults.conf ++++++
[LightDM]
user-authority-in-system-dir=true

[SeatDefaults]
xserver-command=/usr/bin/X
session-wrapper=/etc/X11/xdm/Xsession
greeter-setup-script=/etc/X11/xdm/Xsetup
session-setup-script=/etc/X11/xdm/Xstartup
session-cleanup-script=/etc/X11/xdm/Xreset
++++++ users.conf ++++++
#
# User accounts configuration
#
# NOTE: If you have AccountsService installed on your system, then LightDM will
# use this instead and these settings will be ignored
#
# minimum-uid = Minimum UID required to be shown in greeter
# hidden-users = Users that are not shown to the user
# hidden-shells = Shells that indicate a user cannot login
#
[UserAccounts]
minimum-uid=1000
hidden-users=nobody
hidden-shells=/bin/false /sbin/nologin
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to