Author: qboosh Date: Fri Sep 12 20:03:41 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- trigger to edit xorg.conf (disable RgbPath and removed modules) on upgrade
---- Files affected:
SPECS:
xorg-xserver-server.spec (1.140 -> 1.141)
---- Diffs:
================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.140
SPECS/xorg-xserver-server.spec:1.141
--- SPECS/xorg-xserver-server.spec:1.140 Fri Sep 12 20:19:46 2008
+++ SPECS/xorg-xserver-server.spec Fri Sep 12 22:03:35 2008
@@ -100,6 +100,7 @@
BuildRequires: xorg-util-util-macros >= 0.99.2
#BR: xcalibrateproto, tslib (for KDRIVE only)
#BR: glitz-devel >= 0.4.3 (for XGL and EGL only)
+Requires(triggerpostun): sed >= 4.0
Requires: pixman >= 0.9.5
Requires: xkeyboard-config
# for rgb.txt
@@ -384,6 +385,18 @@
fi
%endif
+%triggerpostun -- xorg-xserver-server < 1.5.0
+if [ -f /etc/X11/xorg.conf ]; then
+ sed -i -e 's/^\s*RgbPath.*$/#& # obsolete option/' /etc/X11/xorg.conf
+ sed -i -e 's/^\s*Load\s*"type1".*$/#& # obsolete module/'
/etc/X11/xorg.conf
+%if %{without record}
+ sed -i -e 's/^\s*Load\s*"record".*$/#& # module disabled in this
build/' /etc/X11/xorg.conf
+%endif
+%if %{without xtrap}
+ sed -i -e 's/^\s*Load\s*"xtrap".*$/#& # deprecated module, disabled/'
/etc/X11/xorg.conf
+%endif
+fi
+
%files
%defattr(644,root,root,755)
%doc COPYING ChangeLog
@@ -499,6 +512,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.141 2008/09/12 20:03:35 qboosh
+- trigger to edit xorg.conf (disable RgbPath and removed modules) on upgrade
+
Revision 1.140 2008/09/12 18:19:46 qboosh
- libglx still provides glapi for dri drivers
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-xserver-server.spec?r1=1.140&r2=1.141&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
