Bug 122454

I can implement this fairly easily, but is it too late to include in FC2?

Created attachment 100068 [details]
xorg.spec.patch

Thanks Warren..  patch looks good, with a few minor changes to
silence potential error situations, and force mv with -f, etc.

Should be in 6.7.0-2

While doing a logic review in my head to ensure the code does the
right thing (and it did seem to do so), I had a few extra neurons
kick in and visualized a simpler solution with slightly reversed
logic.  Here's the new method using a for loop:

  for configfile in XF86Config-4 XF86Config ; do
      if [ -r $configfile ]; then
          if [ -r xorg.conf]; then
              mv -f $configfile $configfile.obsoleted
          else
              mv -f $configfile xorg.conf
          fi
      fi
  done

If the -4 file exists and is readable, then if the xorg.conf file
exists the -4 file gets renamed to obsolete.  If xorg.conf doesn't
exist, the -4 gets renamed to xorg.conf.  Next time through the
loop it tries again with the non-4 file, which will follow same
logic.  End result should be that there is 0 or 1 xorg.conf, which
is the correct file we want, and any other old files are renamed
to obsolete.

The logic seems to work, but if anyone spots any errors scream loud
as we're getting close.

Please note another ommission in the conversion scripts:

http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=121984#c3

Resolved in the latest FC2 errata.