From 992c316aa3a4535ae3faec1d95d4cb689362d335 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 19 Feb 2007 00:34:04 +0000 Subject: [PATCH] - Superstition bump to 7.2 - ExcludeArch of s390{,x} - Only ExclusiveArch those drivers that really are processor-specific - Readd forgotten -tek4957 --- xorg-x11-drivers.spec | 269 +++++++++--------------------------------- 1 file changed, 55 insertions(+), 214 deletions(-) diff --git a/xorg-x11-drivers.spec b/xorg-x11-drivers.spec index c8f0e3e..f7d5551 100644 --- a/xorg-x11-drivers.spec +++ b/xorg-x11-drivers.spec @@ -1,270 +1,105 @@ -# DO NOT HAND EDIT "Requires" LISTS, it is machine generated - Summary: X.Org X11 driver installation package Name: xorg-x11-drivers -Version: 7.1 -Release: 4 +Version: 7.2 +Release: 1%{?dist} License: MIT/X11 Group: User Interface/X Hardware Support URL: http://www.redhat.com BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# This should match the list of architectures we build the Xorg server for. -# Note the lack of s390{,x}. -ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64 +# Xorg is not (yet) buildable for s390. +ExcludeArch: s390 s390x Obsoletes: xorg-x11 -# ************************************************************************* -# IMPORTANT: The ifarch sections below are MACHINE GENERATED. DO NOT -# hand edit, or the changes will be overwritten during the next -# 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 -# -# XXX this is terrible. -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 +# This used to be machine generated. That was a horrible unmaintainable idea. +# So instead we just build all drivers for all arches, except for the drivers +# where we really do know that it's arch-specific. Those go at the end of +# this list. + Requires: xorg-x11-drv-acecad -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 Requires: xorg-x11-drv-aiptek -%endif - -%ifarch %{ix86} Requires: xorg-x11-drv-apm -%endif - -%ifarch %{ix86} Requires: xorg-x11-drv-ark -%endif - -%ifarch %{ix86} x86_64 Requires: xorg-x11-drv-ast -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 Requires: xorg-x11-drv-ati -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 Requires: xorg-x11-drv-calcomp -%endif - -%ifarch %{ix86} Requires: xorg-x11-drv-chips -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 Requires: xorg-x11-drv-cirrus -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 Requires: xorg-x11-drv-citron -%endif - -%ifarch %{ix86} -Requires: xorg-x11-drv-cyrix -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 Requires: xorg-x11-drv-digitaledge -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 Requires: xorg-x11-drv-dmc -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 Requires: xorg-x11-drv-dummy -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 Requires: xorg-x11-drv-dynapro -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 Requires: xorg-x11-drv-elo2300 -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 Requires: xorg-x11-drv-elographics -%endif - -%ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64 Requires: xorg-x11-drv-evdev -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 Requires: xorg-x11-drv-fbdev -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 Requires: xorg-x11-drv-fpit -%endif - -%ifarch %{ix86} alpha Requires: xorg-x11-drv-glint -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 Requires: xorg-x11-drv-hyperpen -%endif - -%ifarch %{ix86} Requires: xorg-x11-drv-i128 -%endif - -%ifarch %{ix86} Requires: xorg-x11-drv-i740 +Requires: xorg-x11-drv-jamstudio +Requires: xorg-x11-drv-joystick +Requires: xorg-x11-drv-keyboard +Requires: xorg-x11-drv-magellan +Requires: xorg-x11-drv-magictouch +Requires: xorg-x11-drv-mga +Requires: xorg-x11-drv-microtouch +Requires: xorg-x11-drv-mouse +Requires: xorg-x11-drv-mutouch +Requires: xorg-x11-drv-nv +Requires: xorg-x11-drv-palmax +Requires: xorg-x11-drv-penmount +Requires: xorg-x11-drv-rendition +Requires: xorg-x11-drv-s3 +Requires: xorg-x11-drv-s3virge +Requires: xorg-x11-drv-savage +Requires: xorg-x11-drv-siliconmotion +Requires: xorg-x11-drv-sis +Requires: xorg-x11-drv-sisusb +Requires: xorg-x11-drv-spaceorb +Requires: xorg-x11-drv-summa +Requires: xorg-x11-drv-tdfx +Requires: xorg-x11-drv-tek4957 +Requires: xorg-x11-drv-trident +Requires: xorg-x11-drv-tseng +Requires: xorg-x11-drv-ur98 +Requires: xorg-x11-drv-v4l +Requires: xorg-x11-drv-vesa +Requires: xorg-x11-drv-vga +Requires: xorg-x11-drv-void +Requires: xorg-x11-drv-voodoo + +# XXX These are all basically the same driver, and should get unified someday +%ifarch %{ix86} +Requires: xorg-x11-drv-amd xorg-x11-drv-cyrix xorg-x11-drv-nsc %endif -%ifarch %{ix86} x86_64 ia64 +# So far i810 is onboard-only. +%ifarch %{ix86} Requires: xorg-x11-drv-i810 %endif -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -Requires: xorg-x11-drv-jamstudio -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -Requires: xorg-x11-drv-joystick -%endif - -%ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64 -Requires: xorg-x11-drv-keyboard -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -Requires: xorg-x11-drv-magellan -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -Requires: xorg-x11-drv-magictouch -%endif - -%ifarch %{ix86} x86_64 ia64 alpha sparc sparc64 -Requires: xorg-x11-drv-mga -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -Requires: xorg-x11-drv-microtouch -%endif - -%ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64 -Requires: xorg-x11-drv-mouse -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -Requires: xorg-x11-drv-mutouch -%endif - +# This chipset has long since been EOLd, and afaik was only ever in x86 laptops %ifarch %{ix86} Requires: xorg-x11-drv-neomagic %endif -%ifarch %{ix86} -Requires: xorg-x11-drv-nsc -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -Requires: xorg-x11-drv-nv -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -Requires: xorg-x11-drv-palmax -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -Requires: xorg-x11-drv-penmount -%endif - -%ifarch %{ix86} -Requires: xorg-x11-drv-rendition -%endif - -%ifarch %{ix86} x86_64 ppc -Requires: xorg-x11-drv-s3 -%endif - -%ifarch %{ix86} x86_64 ppc -Requires: xorg-x11-drv-s3virge -%endif - -%ifarch %{ix86} x86_64 ppc -Requires: xorg-x11-drv-savage -%endif - -%ifarch %{ix86} x86_64 -Requires: xorg-x11-drv-siliconmotion -%endif - -%ifarch %{ix86} x86_64 ppc -Requires: xorg-x11-drv-sis -%endif - -%ifarch %{ix86} x86_64 -Requires: xorg-x11-drv-sisusb -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -Requires: xorg-x11-drv-spaceorb -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -Requires: xorg-x11-drv-summa -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha -Requires: xorg-x11-drv-tdfx -%endif - -%ifarch %{ix86} x86_64 ppc -Requires: xorg-x11-drv-trident -%endif - -%ifarch %{ix86} alpha -Requires: xorg-x11-drv-tseng -%endif - -%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 ppc64 alpha sparc sparc64 -Requires: xorg-x11-drv-vesa -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -Requires: xorg-x11-drv-vga -%endif - +# Thus far via chips are only on x86 and amd64 motherboards %ifarch %{ix86} x86_64 Requires: xorg-x11-drv-via %endif +# vmware soft drivers. yes, vmmouse really isn't ia64-enabled yet. %ifarch %{ix86} x86_64 ia64 Requires: xorg-x11-drv-vmware %endif - %ifarch %{ix86} x86_64 Requires: xorg-x11-drv-vmmouse %endif -%ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64 -Requires: xorg-x11-drv-void -%endif - -%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -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 @@ -285,6 +120,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %changelog +* Sun Feb 18 2007 Adam Jackson 7.2-1 +- Superstition bump to 7.2 +- ExcludeArch of s390{,x} +- Only ExclusiveArch those drivers that really are processor-specific +- Readd forgotten -tek4957 + * Thu Oct 12 2006 Jeremy Katz - 7.1-4 - mga not on ppc