Reorganize and conditionalize for %rhel

xorg-x11-drivers.spec

@@ -1,20 +1,14 @@
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
 Version: 7.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: User Interface/X Hardware Support
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Xorg is not (yet) buildable for s390.  When it is, we'll probably only
 # want dummy and void anyway.  Maybe evdev for uinput stuff?
 ExcludeArch: s390 s390x
 
-# 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.
-#
 # Notable things missing:
 # - imstt, not packaged yet, probably ppc only
 # - impact, since we don't have a mips port
@@ -22,23 +16,48 @@ ExcludeArch: s390 s390x
 # - poulsbo, likewise
 # - ark/chips/s3/tseng/vga, here's a nickel.
 
-Requires: xorg-x11-drv-apm
+# relevant hardware 
+
 Requires: xorg-x11-drv-ast
 Requires: xorg-x11-drv-ati
 Requires: xorg-x11-drv-cirrus
 Requires: xorg-x11-drv-dummy
 Requires: xorg-x11-drv-evdev
 Requires: xorg-x11-drv-fbdev
+Requires: xorg-x11-drv-mga
+Requires: xorg-x11-drv-nouveau
+Requires: xorg-x11-drv-qxl
+Requires: xorg-x11-drv-synaptics
+Requires: xorg-x11-drv-v4l
+Requires: xorg-x11-drv-vesa
+Requires: xorg-x11-drv-void
+Requires: xorg-x11-drv-wacom
+
+# So far intel is onboard-only.
+%ifarch %{ix86} x86_64 ia64
+Requires: xorg-x11-drv-intel
+%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
+
+# irrelevant hardware
+
+%if !0%{?rhel}
+
+Requires: xorg-x11-drv-apm
 Requires: xorg-x11-drv-glint
 Requires: xorg-x11-drv-i128
 Requires: xorg-x11-drv-i740
 Requires: xorg-x11-drv-keyboard
 Requires: xorg-x11-drv-mach64
-Requires: xorg-x11-drv-mga
 Requires: xorg-x11-drv-mouse
-Requires: xorg-x11-drv-nouveau
 Requires: xorg-x11-drv-nv
-Requires: xorg-x11-drv-qxl
 Requires: xorg-x11-drv-r128
 Requires: xorg-x11-drv-rendition
 Requires: xorg-x11-drv-s3virge
@@ -48,17 +67,7 @@ Requires: xorg-x11-drv-sis
 Requires: xorg-x11-drv-sisusb
 Requires: xorg-x11-drv-tdfx
 Requires: xorg-x11-drv-trident
-Requires: xorg-x11-drv-v4l
-Requires: xorg-x11-drv-vesa
-Requires: xorg-x11-drv-void
 Requires: xorg-x11-drv-voodoo
-Requires: xorg-x11-drv-wacom
-
-# This _should_ be all arches, but sweet zombie jesus the buildsystem is
-# a disaster.  FIXME please.
-%ifarch %{ix86} x86_64 ppc
-Requires: xorg-x11-drv-synaptics
-%endif
 
 # cyrix and nsc used to be here too, but are deprecated upstream and
 # should eventually get folded into -geode.
@@ -66,11 +75,6 @@ Requires: xorg-x11-drv-synaptics
 Requires: xorg-x11-drv-geode
 %endif
 
-# So far intel is onboard-only.
-%ifarch %{ix86} x86_64 ia64
-Requires: xorg-x11-drv-intel
-%endif
-
 # This chipset has long since been EOLd, and afaik was only ever in x86 laptops
 %ifarch %{ix86}
 Requires: xorg-x11-drv-neomagic
@@ -83,14 +87,6 @@ Requires: xorg-x11-drv-neomagic
 Requires: xorg-x11-drv-openchrome
 %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
-
 # Sun kit, sparc-only.
 %ifarch sparc sparcv9 sparc64
 Requires: xorg-x11-drv-suntcx
@@ -102,6 +98,8 @@ Requires: xorg-x11-drv-sunleo
 Requires: xorg-x11-drv-sunbw2
 %endif
 
+%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
@@ -122,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Dec 05 2011 Adam Jackson <ajax@redhat.com> 7.4-5
+- Reorganize and conditionalize for %%rhel
+
 * Fri Oct 14 2011 Peter Hutterer <peter.hutterer@redhat.com> 7.4-4
 - Block penmount and elographics too. Penmount is unmaintained, elographics
   is maintained but may not work with the latest Xorg.