- Add cirrus to all arches

- Don't bother building this for s390{,x}
This commit is contained in:
Adam Jackson 2006-08-21 18:32:24 +00:00
parent c01f464673
commit c4c687469d

View File

@ -3,12 +3,16 @@
Summary: X.Org X11 driver installation package Summary: X.Org X11 driver installation package
Name: xorg-x11-drivers Name: xorg-x11-drivers
Version: 7.1 Version: 7.1
Release: 2.1 Release: 3
License: MIT/X11 License: MIT/X11
Group: User Interface/X Hardware Support Group: User Interface/X Hardware Support
URL: http://www.redhat.com URL: http://www.redhat.com
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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
Obsoletes: xorg-x11 Obsoletes: xorg-x11
# ************************************************************************* # *************************************************************************
@ -19,6 +23,8 @@ Obsoletes: xorg-x11
# I used the following to generate the list: # I used the following to generate the list:
# for a in $(< xorg-all-drivers.txt ) ; \ # 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 # 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 %ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
Requires: xorg-x11-drv-acecad Requires: xorg-x11-drv-acecad
%endif %endif
@ -51,7 +57,7 @@ Requires: xorg-x11-drv-calcomp
Requires: xorg-x11-drv-chips Requires: xorg-x11-drv-chips
%endif %endif
%ifarch %{ix86} %ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
Requires: xorg-x11-drv-cirrus Requires: xorg-x11-drv-cirrus
%endif %endif
@ -279,7 +285,11 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-) %defattr(-,root,root,-)
%changelog %changelog
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - sh: line 0: fg: no job control * Mon Aug 21 2006 Adam Jackson <ajackson@redhat.com> 7.1-3
- Add cirrus to all arches
- Don't bother building this for s390{,x}
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> 7.1-2.1
- rebuild - rebuild
* Thu Jun 29 2006 Mike Harris <mharris@redhat.com> 7.1-2 * Thu Jun 29 2006 Mike Harris <mharris@redhat.com> 7.1-2