rpms/xorg-x11-server/devel xorg-x11-server.spec,1.198,1.199

[fedora-cvs-commits at redhat.com]

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Wed Jan 24 2007 Adam Jackson <ajax at redhat.com> 1.2.0-2
- Delete ModulePath lines rather than attempt to munge them.  (#186338)



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- xorg-x11-server.spec	23 Jan 2007 19:24:01 -0000	1.198
+++ xorg-x11-server.spec	24 Jan 2007 22:51:48 -0000	1.199
@@ -8,7 +8,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.2.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -471,9 +471,8 @@
       # unnecessary, and break upgrades from monolithic to modular X.
       # Fixes bugs (#173036, 173435, 173453, 173428)
       perl -p -i -e 's#^\s*RgbPath.*$##gi' $configfile
-      # If ModulePath is specified in the config file, check for the old
-      # monolithic module path, and replace it with the new one.
-      perl -p -i -e "m,^\s*ModulePath.*\"${OLD_MODULEPATH}\".*$,; s,${OLD_MODULEPATH},%{moduledir}," $configfile
+      # If ModulePath is specified in the config file, delete it.
+      perl -p -i -e 's#^\s*ModulePath.*$##gi' $configfile
     fi
 #  done
   popd
@@ -633,6 +632,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Jan 24 2007 Adam Jackson <ajax at redhat.com> 1.2.0-2
+- Delete ModulePath lines rather than attempt to munge them.  (#186338)
+
 * Tue Jan 23 2007 Adam Jackson <ajax at redhat.com> 1.2.0-1
 - Xorg server 1.2.0.