rpms/gdm/devel gdm-2.13.0.4-change-defaults.patch, 1.1, 1.2 gdm.spec, 1.109, 1.110

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4460

Modified Files:
	gdm-2.13.0.4-change-defaults.patch gdm.spec 
Log Message:
- use xinit Xsession again.


gdm-2.13.0.4-change-defaults.patch:
 gdm.conf.in |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

Index: gdm-2.13.0.4-change-defaults.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.13.0.4-change-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.13.0.4-change-defaults.patch	9 Jan 2006 10:06:50 -0000	1.1
+++ gdm-2.13.0.4-change-defaults.patch	9 Jan 2006 19:27:38 -0000	1.2
@@ -1,5 +1,5 @@
 --- gdm-2.13.0.4/config/gdm.conf.in.change-defaults	2005-12-20 21:22:36.000000000 -0500
-+++ gdm-2.13.0.4/config/gdm.conf.in	2006-01-08 23:12:51.000000000 -0500
++++ gdm-2.13.0.4/config/gdm.conf.in	2006-01-09 14:03:14.000000000 -0500
 @@ -59,9 +59,9 @@ TimedLoginDelay=30
  # should leave this alone.
  #Chooser=@EXPANDED_LIBEXECDIR@/gdmchooser
@@ -27,7 +27,7 @@
  
  # If you are having trouble with using a single server for a long time and want
  # GDM to kill/restart the server, turn this on.  On Solaris, this value is
-@@ -116,8 +116,8 @@ DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm
+@@ -116,22 +116,22 @@ DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm
  XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing
  # Reboot, Halt and suspend commands, you can add different commands separated
  # by a semicolon.  GDM will use the first one it can find.
@@ -38,7 +38,14 @@
  #SuspendCommand=@SUSPEND_COMMAND@
  # Probably should not touch the below this is the standard setup.
  ServAuthDir=@EXPANDED_AUTHDIR@
-@@ -131,7 +131,7 @@ BaseXsession=@EXPANDED_SYSCONFDIR@/gdm/X
+ # This is our standard startup script.  A bit different from a normal X
+ # session, but it shares a lot of stuff with that.  See the provided default
+ # for more information.
+-BaseXsession=@EXPANDED_SYSCONFDIR@/gdm/Xsession
++BaseXsession=/etc/X11/xinit/Xsession
+ # This is a directory where .desktop files describing the sessions live.  It is
+ # really a PATH style variable since 2.4.4.2 to allow actual interoperability
+ # with KDM.  Note that <sysconfdir>/dm/Sessions is there for backwards
  # compatibility reasons with 2.4.4.x.
  #SessionDesktopDir=/etc/X11/sessions/:@EXPANDED_SYSCONFDIR@/dm/Sessions/:@EXPANDED_DATADIR@/gdm/BuiltInSessions/:@EXPANDED_DATADIR@/xsessions/
  # This is the default .desktop session.  One of the ones in SessionDesktopDir


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- gdm.spec	9 Jan 2006 10:08:13 -0000	1.109
+++ gdm.spec	9 Jan 2006 19:27:38 -0000	1.110
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.13.0.4
-Release: 1
+Release: 2
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -153,6 +153,10 @@
 # create log dir
 mkdir -p $RPM_BUILD_ROOT/var/log/gdm
 
+# remove the gdm Xsession as we're using the xdm one
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Xsession
+(cd $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm; ln -sf ../xinit/Xsession .)
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
 
@@ -275,6 +279,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Mon Jan 9 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.4-2
+- use xinit Xsession again.
+
 * Mon Jan 9 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.4-1
 - update to 2.13.0.4