rpms/gdm/devel gdm.spec,1.113,1.114

[fedora-cvs-commits at redhat.com]

Author: rstrode

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

Modified Files:
	gdm.spec 
Log Message:
- improve migration snippet (bug 177443). 



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- gdm.spec	16 Jan 2006 16:33:47 -0000	1.113
+++ gdm.spec	16 Jan 2006 17:27:58 -0000	1.114
@@ -224,14 +224,34 @@
 # if the user already has a config file, then 
 # migrate it to the new location 
 if [ $1 -ge 2 ] && [ -f %{_sysconfdir}/X11/gdm/gdm.conf ]; then
-    mv -f %{_sysconfdir}/X11/gdm/gdm.conf %{_datadir}/gdm/config/gdm.conf-custom
+    cp -a %{_sysconfdir}/X11/gdm/gdm.conf %{_datadir}/gdm/config/gdm.conf-custom
 
-    # Also migrate the X configuration to work with modular X
-    sed -ie 's@^command=/usr/X11R6/bin/X at command=/usr/bin/Xorg@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -ie 's@^Xnest=/usr/X11R6/bin/Xnest at Xnest=/usr/X11R6/bin/Xnest@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -ie 's@^BaseXsession=/etc/X11/xdm/Xsession at BaseXsession=/etc/X11/xinit/Xsession@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -ie 's@^Greeter=/usr/bin/gdmgreeter at Greeter=/usr/libexec/gdmgreeter@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -ie 's@^RemoteGreeter=/usr/bin/gdmlogin at RemoteGreeter=/usr/libexec/gdmlogin@' %{_datadir}/gdm/config/gdm.conf-custom
+    # Comment out some entries from the custom config file that may have changed
+    # locations in the update
+    sed -ie 's@^command=/usr/X11R6/bin/X@#command=/usr/bin/Xorg@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/X11R6/bin/Xnest@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xinit/Xsession@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^Greeter=/usr/bin/gdmgreeter@#Greeter=/usr/libexec/gdmgreeter@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^RemoteGreeter=/usr/bin/gdmlogin@#RemoteGreeter=/usr/libexec/gdmlogin@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^GraphicalTheme=Bluecurve@#&@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^BackgroundColor=#20305a@#&@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin@#&@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin@#&@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^HostImageDir=/usr/share/hosts/@#HostImageDir=/usr/share/pixmaps/faces/@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^LogDir=/var/log/gdm@#&@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^PostLoginScriptDir=/etc/X11/gdm/PostLogin@#&@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^PreLoginScriptDir=/etc/X11/gdm/PreLogin@#&@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^PreSessionScriptDir=/etc/X11/gdm/PreSession@#&@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^PostSessionScriptDir=/etc/X11/gdm/PostSession@#&@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^DisplayInitDir=/var/run/gdm.pid@#&@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot@#&@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff@#&@' %{_datadir}/gdm/config/gdm.conf-custom 
+    sed -ie 's@^ServAuthDir=/var/gdm@#&@' %{_datadir}/gdm/config/gdm.conf-custom 
+
+    # Someone might be trying to use different greeters for the local/remote cases
+    # so migrate them to their new locations.
+    sed -ie 's@^Greeter=/usr/bin/gdmlogin at Greeter=/usr/libexec/gdmlogin@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -ie 's@^RemoteGreeter=/usr/bin/gdmgreeter at RemoteGreeter=/usr/libexec/gdmgreeter@' %{_datadir}/gdm/config/gdm.conf-custom
 fi
 
 %{_sbindir}/gdm-safe-restart || :
@@ -287,7 +307,7 @@
 
 %changelog
 * Mon Jan 16 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.4-4
-- migrate to new greeter location (bug 177443). 
+- improve migration snippet (bug 177443). 
 
 * Fri Jan 13 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.4-3
 - migrate X server configuration for pre-modular X configurations.