[xorg-x11-drv-ati] Don't package UMS theatre support

[Adam Jackson]

commit 651708def598d9f0eebfa762162f68b10f1bdb62
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Mar 5 15:27:04 2012 -0500

    Don't package UMS theatre support
    
    - Trim some Requires that haven't been necessary since at least F13

 xorg-x11-drv-ati.spec |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index 99e313f..0fe35d1 100644
--- a/xorg-x11-drv-ati.spec
+++ b/xorg-x11-drv-ati.spec
@@ -11,7 +11,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.14.3
-Release:   10%{?gver}%{?dist}
+Release:   11%{?gver}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -35,11 +35,6 @@ BuildRequires: xorg-x11-util-macros >= 1.1.5
 
 Requires: Xorg %(xserver-sdk-abi-requires ansic)
 Requires: Xorg %(xserver-sdk-abi-requires videodrv)
-Requires:  libdrm >= 2.4.17-0.1
-# new CS method needs newer kernel
-Requires:  kernel >= 2.6.29.1-111.fc11
-Obsoletes: xorg-x11-drv-avivo <= 0.0.2
-Obsoletes: xorg-x11-drv-radeonhd <= 1.3.0-20
 
 %description 
 X.Org X11 ati video driver.
@@ -62,6 +57,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
+# these only work in UMS, which is not supported
+rm -rf $RPM_BUILD_ROOT%{moduledir}/multimedia/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,13 +67,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{driverdir}/ati_drv.so
 %{driverdir}/radeon_drv.so
-%{moduledir}/multimedia/theatre200_drv.so
-%{moduledir}/multimedia/theatre_detect_drv.so
-%{moduledir}/multimedia/theatre_drv.so
 %{_mandir}/man4/ati.4*
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Mar 05 2012 Adam Jackson <ajax at redhat.com> 6.14.3-11
+- Don't package UMS theatre support
+- Trim some Requires that haven't been necessary since at least F13
+
 * Sat Feb 11 2012 Peter Hutterer <peter.hutterer at redhat.com> - 6.14.3-10.20120206git36c190671
 - ABI rebuild