diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec index 36d7e03..1f20136 100644 --- a/xorg-x11-drv-ati.spec +++ b/xorg-x11-drv-ati.spec @@ -7,7 +7,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.13.0 -Release: 0.21.%{gitdate}git%{gitversion}%{?dist} +Release: 0.22.%{gitdate}git%{gitversion}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -17,7 +17,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{tarball}-%{gitdate}.tar.xz # unlike the other drivers, radeon.xinf is generated Source1: mkxinf -Source2: radeon-rlc-firmware-1.tar.bz2 Patch6: radeon-6.9.0-bgnr-enable.patch Patch10: radeon-6.12.2-lvds-default-modes.patch @@ -43,14 +42,8 @@ Obsoletes: xorg-x11-drv-avivo <= 0.0.2 %description X.Org X11 ati video driver. -%package firmware -Summary: ATI firmware for R600 RLC - -%description firmware -Firmware for ATI R600/R700 IRQs - %prep -%setup -q -n %{tarball}-%{gitdate} -a 2 +%setup -q -n %{tarball}-%{gitdate} %patch6 -p1 -b .bgnr %patch10 -p1 -b .lvds %patch13 -p1 -b .def @@ -72,9 +65,6 @@ install -m 0644 radeon.xinf $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- -%{__mkdir_p} %{buildroot}/lib/firmware/radeon -%{__install} -p -m 0644 *.bin %{buildroot}/lib/firmware/radeon/ - %clean rm -rf $RPM_BUILD_ROOT @@ -89,12 +79,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/ati.4* %{_mandir}/man4/radeon.4* -%files firmware -%defattr(-,root,root,-) -%doc LICENSE.radeon.firmware -/lib/firmware/radeon/*.bin - %changelog +* Wed Feb 10 2010 Dave Airlie 6.13.0-0.22.20100208git4f9d1714a +- drop firmware now in linux-firmware + * Mon Feb 08 2010 Dave Airlie 6.13.0-0.21.20100208git4f9d1714a - rebase to upstream - evergreen modesetting support + displayport fixes for UMS