- Move hardcoded xsetroot background color to fallback cases (#205901).

Xclients

@@ -46,6 +46,8 @@ rm -f $HOME/Xrootenv.0
 {
     # 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

xinitrc

@@ -26,6 +26,7 @@ elif [ -f /etc/X11/xinit/Xclients ]; then
 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

xinitrc-common

@@ -18,8 +18,6 @@ if [ -r /etc/profile.d/lang.sh ]; then
   . /etc/profile.d/lang.sh
 fi
 
-[ -x /usr/bin/xsetroot ] && /usr/bin/xsetroot -solid '#222E45'
-
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
 userxkbmap=$HOME/.Xkbmap

xorg-x11-xinit.spec

@@ -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 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Mon Sep 25 2006 Kristian Høgsberg <krh@redhat.com> - 1.0.2-10.fc6
+- Move hardcoded xsetroot background color to fallback cases (#205901).
+
 * Thu Aug 17 2006 Kristian Høgsberg <krh@redhat.com> - 1.0.2-9.fc6
 - Start ssh-agent for startx also (#169259).