[xorg-x11-drv-ati] radeon 6.14.3

Adam Jackson ajax at fedoraproject.org
Thu Nov 10 21:05:06 UTC 2011


commit 25ea9a3dadfb40ce63c1838a8c595db2b4e289d8
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Nov 10 16:05:02 2011 -0500

    radeon 6.14.3

 .gitignore            |    1 +
 sources               |    2 +-
 xorg-x11-drv-ati.spec |   23 +++++++++++++++--------
 3 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e14687e..585bf1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ xf86-video-ati-20100705.tar.xz
 /xf86-video-ati-20110316.tar.xz
 /xf86-video-ati-20110504.tar.xz
 /xf86-video-ati-20110727.tar.xz
+/xf86-video-ati-6.14.3.tar.bz2
diff --git a/sources b/sources
index 202ca2f..5765533 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-12ba9579e90a6df05e5b396f8186654d  xf86-video-ati-20110727.tar.xz
+19126c8421a05d9605883dcf7498d876  xf86-video-ati-6.14.3.tar.bz2
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index 352cbe9..9c41ed3 100644
--- a/xorg-x11-drv-ati.spec
+++ b/xorg-x11-drv-ati.spec
@@ -1,19 +1,23 @@
 %define tarball xf86-video-ati
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
-%define gitdate 20110727
-%define gitversion 8c9266ed2
+#define gitdate 20110727
+#define gitversion 8c9266ed2
+
+%if 0%{?gitdate}
+%define gver .%{gitdate}git%{gitversion}
+%endif
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.14.2
-Release:   3.%{gitdate}git%{gitversion}%{?dist}
+Version:   6.14.3
+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
 # unlike the other drivers, radeon.xinf is generated
 Source1:    mkxinf
 
@@ -44,13 +48,13 @@ Obsoletes: xorg-x11-drv-radeonhd <= 1.3.0-20
 X.Org X11 ati video driver.
 
 %prep
-%setup -q -n %{tarball}-%{gitdate}
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}}
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
 
 %build
-autoreconf -iv
+# autoreconf -iv
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -81,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Nov 10 2011 Adam Jackson <ajax at redhat.com> 6.14.3-1
+- radeon 6.14.3
+
 * Wed Nov 09 2011 ajax <ajax at redhat.com> - 6.14.2-3.20110727git8c9266ed2
 - ABI rebuild
 


More information about the scm-commits mailing list