rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.24,1.25

[Adam Jackson (ajax)]

Author: ajax

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

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
* Mon Oct 15 2007 Adam Jackson <ajax at redhat.com> 7.2-9
- Archify synaptics, it's not buildable most places.



Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-drivers.spec	12 Oct 2007 20:02:23 -0000	1.24
+++ xorg-x11-drivers.spec	15 Oct 2007 21:09:57 -0000	1.25
@@ -1,12 +1,13 @@
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
 Version: 7.2
-Release: 8%{?dist}
+Release: 9%{?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.
+# 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.
@@ -15,7 +16,6 @@
 # this list.
 
 Requires: linuxwacom
-Requires: synaptics
 Requires: xorg-x11-drv-acecad
 Requires: xorg-x11-drv-aiptek
 Requires: xorg-x11-drv-apm
@@ -72,6 +72,12 @@
 Requires: xorg-x11-drv-void
 Requires: xorg-x11-drv-voodoo
 
+# This _should_ be all arches, but sweet zombie jesus the buildsystem is
+# a disaster.  FIXME please.
+%ifarch %{ix86} x86_64 ppc
+Requires: synaptics
+%endif
+
 # 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
@@ -122,6 +128,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Oct 15 2007 Adam Jackson <ajax at redhat.com> 7.2-9
+- Archify synaptics, it's not buildable most places.
+
 * Fri Oct 12 2007 Jeremy Katz <katzj at redhat.com> 7.2-8
 - Add avivo