diff --git a/.gitignore b/.gitignore index 8a22628..c250ee1 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ xf86-video-ati-20100705.tar.xz /xf86-video-ati-7.2.0.tar.bz2 /xf86-video-ati-20131101.tar.xz /xf86-video-ati-20140419.tar.xz +/xf86-video-ati-7.4.0.tar.bz2 diff --git a/sources b/sources index c9e90d4..70df6e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b09eb0408a48fe0b65b5f7cad98490de xf86-video-ati-20140419.tar.xz +8ee095009e927d61be522f392bdb843e xf86-video-ati-7.4.0.tar.bz2 diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec index 2c758a2..acc9a6e 100644 --- a/xorg-x11-drv-ati.spec +++ b/xorg-x11-drv-ati.spec @@ -1,7 +1,7 @@ %define tarball xf86-video-ati %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers -%define gitdate 20140419 +#define gitdate 20140419 %define gitversion 48d3dbc %if 0%{?gitdate} @@ -11,13 +11,13 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 7.4.0 -Release: 0.4%{?gver}%{?dist} +Release: 1%{?gver}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support -#Source0: http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 -Source0: %{tarball}-%{gitdate}.tar.xz +Source0: http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 +#Source0: %{tarball}-%{gitdate}.tar.xz Patch10: radeon-6.12.2-lvds-default-modes.patch Patch13: fix-default-modes.patch @@ -52,26 +52,22 @@ autoreconf -iv make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT - -make install DESTDIR=$RPM_BUILD_ROOT - +%make_install 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 - %files -%defattr(-,root,root,-) %{driverdir}/ati_drv.so %{driverdir}/radeon_drv.so %{_mandir}/man4/ati.4* %{_mandir}/man4/radeon.4* %changelog +* Wed Jul 2 2014 Hans de Goede - 7.4.0-1 +- Update to 7.4.0 (rhbz#907141) + * Mon Jun 16 2014 Hans de Goede - 7.4.0-0.4.20140419git48d3dbc - xserver 1.15.99.903 ABI rebuild