rpms/xorg-x11/devel xorg-x11.spec,1.169,1.170

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	xorg-x11.spec 
Log Message:
- Updated pre script to only strip away XkbRules lines indicating "xfree86"
  or "xorg" rules be used.  (#142429)




Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- xorg-x11.spec	5 Apr 2005 11:41:38 -0000	1.169
+++ xorg-x11.spec	5 Apr 2005 18:11:31 -0000	1.170
@@ -1999,7 +1999,7 @@
 	# driver, to the newer "kbd" driver.
         perl -p -i -e 's/Driver(.*)"keyboard"/Driver\1"kbd"/gi' $configfile
 	# Remove any Options "XkbRules" lines that may be present
-        perl -p -i -e 's/^.*Option.*"XkbRules".*\n$//gi' $configfile
+        perl -p -i -e 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' $configfile
       fi
     done
   }
@@ -3565,6 +3565,10 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Tue Apr  5 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-20
+- Updated pre script to only strip away XkbRules lines indicating "xfree86"
+  or "xorg" rules be used.  (#142429)
+
 * Mon Apr  4 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-19
 - xfs.init updated with fixes for chkfontpath invocation, as the previous
   code did not filter the output of chkfontpath very good.  The new sed