rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.5,1.6

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Feb 9 12:05:53 UTC 2006 

Author: mharris

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

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
* Thu Feb  9 2006 Mike Harris <mharris at redhat.com> 7.0-1
- Bumped version to 7.0-1
- Updated the driver list to match current rawhide, X11R7.0



Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drivers.spec	7 Feb 2006 14:21:06 -0000	1.5
+++ xorg-x11-drivers.spec	9 Feb 2006 12:05:25 -0000	1.6
@@ -1,5 +1,9 @@
+# DO NOT HAND EDIT "Requires" LISTS, it is machine generated
+
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
+Version: 7.0
+Release: 1
 Version: 0.99.2
 Release: 4.1
 License: MIT/X11
@@ -14,12 +18,13 @@
 #            automatic update.
 #
 # I used the following to generate the list:
-# for a in $(< xorg-all-drivers.txt ) ; do (echo -n "%ifarch " ;grep "^ExclusiveArch:" $a/devel/$a.spec | sed -e "s/^ExclusiveArch: //" ; echo -e "Requires: $a\n%endif\n") ; done
-%ifarch %{ix86} x86_64 ia64 ppc
+# for a in $(< xorg-all-drivers.txt ) ; \
+#   do (echo -n "%ifarch " ;grep "^ExclusiveArch:" $a/devel/$a.spec | sed -e "s/^ExclusiveArch: //" ; echo -e "Requires: $a\n%endif\n") ; done
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-acecad
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-aiptek
 %endif
 
@@ -35,7 +40,7 @@
 Requires: xorg-x11-drv-ati
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-calcomp
 %endif
 
@@ -47,7 +52,7 @@
 Requires: xorg-x11-drv-cirrus
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-citron
 %endif
 
@@ -55,11 +60,11 @@
 Requires: xorg-x11-drv-cyrix
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-digitaledge
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-dmc
 %endif
 
@@ -67,19 +72,19 @@
 Requires: xorg-x11-drv-dummy
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-dynapro
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-elo2300
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-elographics
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-evdev
 %endif
 
@@ -87,7 +92,7 @@
 Requires: xorg-x11-drv-fbdev
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-fpit
 %endif
 
@@ -95,7 +100,7 @@
 Requires: xorg-x11-drv-glint
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-hyperpen
 %endif
 
@@ -111,39 +116,39 @@
 Requires: xorg-x11-drv-i810
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-jamstudio
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-joystick
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-keyboard
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-magellan
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-magictouch
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-mga
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-microtouch
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-mouse
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-mutouch
 %endif
 
@@ -155,15 +160,15 @@
 Requires: xorg-x11-drv-nsc
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-nv
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-palmax
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-penmount
 %endif
 
@@ -195,15 +200,15 @@
 Requires: xorg-x11-drv-sisusb
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-spaceorb
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-summa
 %endif
 
-%ifarch %{ix86} x86_64
+%ifarch %{ix86} x86_64 ia64 ppc alpha
 Requires: xorg-x11-drv-tdfx
 %endif
 
@@ -211,14 +216,18 @@
 Requires: xorg-x11-drv-trident
 %endif
 
-%ifarch %{ix86}
+%ifarch %{ix86} alpha
 Requires: xorg-x11-drv-tseng
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-ur98
 %endif
 
+%ifarch %{ix86}
+Requires: xorg-x11-drv-v4l
+%endif
+
 %ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-vesa
 %endif
@@ -235,7 +244,7 @@
 Requires: xorg-x11-drv-vmware
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-void
 %endif
 
@@ -243,6 +252,7 @@
 Requires: xorg-x11-drv-voodoo
 %endif
 
+
 %description
 The purpose of this package is to require all of the individual X.Org
 driver rpms, to allow the OS installation software to install all drivers
@@ -258,22 +268,25 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
-%defattr(-,root,root,-)
-%doc
-
+#%files
+#%defattr(-,root,root,-)
+#%doc
 
 %changelog
+* Thu Feb 09 2006 Mike Harris <mharris at redhat.com> 7.0-1
+- Bumped version to 7.0-1
+- Updated the driver list to match current rawhide, X11R7.0
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.99.2-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Nov 23 2005 Mike Harris <mharris at redhat.com> 0.99.2-4
 - Add ur98 driver back, as it is part of X11R7 RC2
 
-* Tue Nov 15 2005 Jeremy Katz <katzj at redhat.com> - 0.99.2-3
+* Tue Nov 15 2005 Jeremy Katz <katzj at redhat.com> 0.99.2-3
 - ur98 driver doesn't exist
 
-* Tue Nov 15 2005 Jeremy Katz <katzj at redhat.com> - 0.99.2-2
+* Tue Nov 15 2005 Jeremy Katz <katzj at redhat.com> 0.99.2-2
 - add an obsoletes on xorg-x11 to get pulled in on upgrades
 
 * Tue Nov 15 2005 Mike Harris <mharris at redhat.com> 0.99.2-1

More information about the fedora-cvs-commits mailing list