From 621a575c7ba977da3ca1c732d613608864f3d31ef595ba63db9ed596b63445a0 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 9 Feb 2007 18:33:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=5 --- gdm.changes | 6 ++++++ gdm.spec | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/gdm.changes b/gdm.changes index eb5b65c..4c83b19 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 17:58:38 CET 2007 - crivera@suse.de + +- Add PreReq for insserv and ensure that we always enable + earlygdm in the post-install script. This fixes 192998. + ------------------------------------------------------------------- Wed Jan 31 16:27:35 CET 2007 - sbrabec@suse.cz diff --git a/gdm.spec b/gdm.spec index a1fe534..cf9bd48 100644 --- a/gdm.spec +++ b/gdm.spec @@ -17,12 +17,15 @@ BuildRequires: gnome-icon-theme PreReq: /usr/sbin/groupadd PreReq: /usr/sbin/useradd PreReq: /usr/sbin/usermod +%if %suse_version < 1010 PreReq: %fillup_prereq +%endif +PreReq: %insserv_prereq License: GNU General Public License (GPL) Group: System/GUI/GNOME Autoreqprov: on Version: 2.16.1 -Release: 51 +Release: 53 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -169,23 +172,23 @@ rm -f etc/gdm/gdm_sysconfig.conf /usr/sbin/useradd -r -o -g gdm -s /bin/false \ -c "Gnome Display Manager daemon" -d /var/lib/gdm gdm 2> /dev/null || : /usr/sbin/usermod -g gdm -G gdm -s /bin/false gdm 2> /dev/null -%if %suse_version <= 1020 %post %if %suse_version < 1010 %{fillup_only -n displaymanager -s gdm} %{fillup_and_insserv -npY displaymanager earlygdm} +%else +%{fillup_and_insserv -pY earlygdm} %endif +%if %suse_version <= 1020 sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/init.d/xdm %triggerin -- xorg-x11 sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/init.d/xdm %endif -%if %suse_version < 1010 %postun %insserv_cleanup -%endif %files -f %{name}.lang %defattr(-,root,root) @@ -225,6 +228,9 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i %dir /usr/share/xsessions %changelog -n gdm +* Fri Feb 09 2007 - crivera@suse.de +- Add PreReq for insserv and ensure that we always enable + earlygdm in the post-install script. This fixes 192998. * Wed Jan 31 2007 - sbrabec@suse.cz - Fixed PreReq for /etc/init.d/xdm in older products. * Tue Jan 23 2007 - sbrabec@suse.cz