From 4961ec7b790c1595a8f57a91fe46d49b26a0a4a7 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 15 Oct 2007 21:09:57 +0000 Subject: [PATCH] - Archify synaptics, it's not buildable most places. --- xorg-x11-drivers.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/xorg-x11-drivers.spec b/xorg-x11-drivers.spec index ef66c60..732f080 100644 --- a/xorg-x11-drivers.spec +++ b/xorg-x11-drivers.spec @@ -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 @@ ExcludeArch: s390 s390x # 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-vesa 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 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %changelog +* Mon Oct 15 2007 Adam Jackson 7.2-9 +- Archify synaptics, it's not buildable most places. + * Fri Oct 12 2007 Jeremy Katz 7.2-8 - Add avivo