rpms/xorg-x11-xinit/devel Xclients, 1.2, 1.3 xinitrc, 1.2, 1.3 xinitrc-common, 1.1, 1.2 xorg-x11-xinit.spec, 1.29, 1.30

[fedora-cvs-commits at redhat.com]

Author: krh

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22975

Modified Files:
	Xclients xinitrc xinitrc-common xorg-x11-xinit.spec 
Log Message:
* Mon Sep 25 2006 Kristian Høgsberg <krh at redhat.com> - 1.0.2-10.fc6
- Move hardcoded xsetroot background color to fallback cases (#205901).



Index: Xclients
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/Xclients,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Xclients	19 Jul 2006 10:31:02 -0000	1.2
+++ Xclients	25 Sep 2006 17:30:37 -0000	1.3
@@ -46,6 +46,8 @@
 {
     # gosh, neither fvwm95 nor fvwm2 is available; 
     # fall back to failsafe settings
+    [ -x /usr/bin/xsetroot ] && /usr/bin/xsetroot -solid '#222E45'
+
     if [ -x /usr/bin/xclock ] ; then
 	/usr/bin/xclock -geometry 100x100-5+5 &
     elif [ -x /usr/bin/xclock ] ; then


Index: xinitrc
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xinitrc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xinitrc	18 Aug 2006 02:03:22 -0000	1.2
+++ xinitrc	25 Sep 2006 17:30:37 -0000	1.3
@@ -26,6 +26,7 @@
 else
     # Failsafe settings.  Although we should never get here
     # (we provide fallbacks in Xclients as well) it can't hurt.
+    [ -x /usr/bin/xsetroot ] && /usr/bin/xsetroot -solid '#222E45'
     [ -x /usr/bin/xclock ] && /usr/bin/xclock -geometry 100x100-5+5 &
     [ -x /usr/bin/xterm ] && xterm -geometry 80x50-50+150 &
     [ -x /usr/bin/twm ] && /usr/bin/twm


Index: xinitrc-common
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xinitrc-common,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinitrc-common	1 Nov 2005 02:00:56 -0000	1.1
+++ xinitrc-common	25 Sep 2006 17:30:37 -0000	1.2
@@ -18,8 +18,6 @@
   . /etc/profile.d/lang.sh
 fi
 
-[ -x /usr/bin/xsetroot ] && /usr/bin/xsetroot -solid '#222E45'
-
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
 userxkbmap=$HOME/.Xkbmap


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xorg-x11-xinit.spec	18 Aug 2006 02:03:23 -0000	1.29
+++ xorg-x11-xinit.spec	25 Sep 2006 17:30:37 -0000	1.30
@@ -4,7 +4,7 @@
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
 Version: %{xinitver}
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -101,6 +101,9 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Mon Sep 25 2006 Kristian Høgsberg <krh at redhat.com> - 1.0.2-10.fc6
+- Move hardcoded xsetroot background color to fallback cases (#205901).
+
 * Thu Aug 17 2006 Kristian Høgsberg <krh at redhat.com> - 1.0.2-9.fc6
 - Start ssh-agent for startx also (#169259).