rpms/xorg-x11-server
6
0
Fork 0
Code Issues Pull Requests Releases Activity

* Wed Jun 27 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-12

Browse Source 
- Tweak %post Xorg slightly to not demolish ModulePath lines installed by
  the nvidia driver.  (#244359)
This commit is contained in:
Adam Jackson 2007-06-27 14:07:46 +00:00
parent f554209720
commit 3e0fc774a0
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
xorg-x11-server.spec
View File

@ -9,7 +9,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.3.0.0 Version: 1.3.0.0
Release: 11%{?dist} Release: 12%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
@ -431,25 +431,30 @@ rm -rf $RPM_BUILD_ROOT
%if %{with_hw_servers} %if %{with_hw_servers}
%pre Xorg %pre Xorg
{ {
pushd /etc/X11 pushd /etc/X11
for configfile in XF86Config XF86Config-4 ; do
if [ -r $configfile ]; then for configfile in XF86Config XF86Config-4 ; do
if [ -r xorg.conf ]; then if [ -r $configfile ]; then
mv -f $configfile $configfile.obsoleted if [ -r xorg.conf ]; then
else mv -f $configfile $configfile.obsoleted
mv -f $configfile xorg.conf else
fi mv -f $configfile xorg.conf
fi fi
done fi
configfile="xorg.conf" done
if [ -r xorg.conf -a -w xorg.conf ]; then
[ -e xorg.conf ] || return 0
perl -p -i -e 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' xorg.conf perl -p -i -e 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' xorg.conf
perl -p -i -e 's/^\s*Driver(.*)"keyboard"/Driver\1"kbd"/gi' xorg.conf perl -p -i -e 's/^\s*Driver(.*)"keyboard"/Driver\1"kbd"/gi' xorg.conf
perl -p -i -e 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' xorg.conf perl -p -i -e 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' xorg.conf
perl -p -i -e 's#^\s*RgbPath.*$##gi' xorg.conf perl -p -i -e 's#^\s*RgbPath.*$##gi' xorg.conf
perl -p -i -e 's#^\s*ModulePath.*$##gi' xorg.conf # lame, the nvidia driver needs to override this
fi if ! grep -q 'ModulePath.*nvidia' xorg.conf ; then
popd perl -p -i -e 's#^\s*ModulePath.*$##gi' xorg.conf
fi
popd
} &> /dev/null || : } &> /dev/null || :
%endif %endif
@ -583,6 +588,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Jun 27 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-12
- Tweak %%post Xorg slightly to not demolish ModulePath lines installed by
the nvidia driver. (#244359)
* Wed Jun 27 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-11 * Wed Jun 27 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-11
- Obsolete the joystick and elo2300 drivers, they never worked and shouldn't - Obsolete the joystick and elo2300 drivers, they never worked and shouldn't
be installed. be installed.