rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.30,1.31

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drivers/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1047

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
* Fri Apr 04 2008 Adam Jackson <ajax at redhat.com> 7.3-4
- Remove -nsc and -cyrix.



Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xorg-x11-drivers.spec	3 Mar 2008 22:30:42 -0000	1.30
+++ xorg-x11-drivers.spec	4 Apr 2008 19:01:48 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
 Version: 7.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -80,9 +80,10 @@
 Requires: synaptics
 %endif
 
-# XXX These are all basically the same driver, and should get unified someday
+# cyrix and nsc used to be here too, but are deprecated upstream and
+# should eventually get folded into -amd / -geode.
 %ifarch %{ix86}
-Requires: xorg-x11-drv-amd xorg-x11-drv-cyrix xorg-x11-drv-nsc
+Requires: xorg-x11-drv-amd
 %endif
 
 # So far i810 is onboard-only.
@@ -130,6 +131,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Apr 04 2008 Adam Jackson <ajax at redhat.com> 7.3-4
+- Remove -nsc and -cyrix.
+
 * Mon Mar 03 2008 Adam Jackson <ajax at redhat.com> 7.3-3
 - Drop magictouch, it can not work and can never have worked.