- prepared for kernel >= 2.6.13: link Module.symvers

[packages/X11-driver-firegl.git] / X11-driver-firegl.spec

diff --git a/X11-driver-firegl.spec b/X11-driver-firegl.spec
index 4c6f12d6455d10a018517073d0b3ecf0b96aeae4..d954bb5f617628e95c9c02d2ba05d0423cf00453 100644 (file)
--- a/X11-driver-firegl.spec
+++ b/X11-driver-firegl.spec
@@ -18,7 +18,7 @@
 %else
 %define                need_x86        0%{?with_incall:1}
 %endif
-%ifarch amd64
+%ifarch %{x8664}
 %define                need_amd64      1
 %else
 %define                need_amd64      0%{?with_incall:1}
@@ -27,34 +27,33 @@
 Summary:       Linux Drivers for ATI graphics accelerators
 Summary(pl):   Sterowniki do akceleratorów graficznych ATI
 Name:          X11-driver-firegl
-Version:       8.12.10
-%define                _rel    2
+Version:       8.16.20
+%define                _rel    1
 Release:       %{_rel}
 License:       ATI Binary (parts are GPL)
 Vendor:                ATI
 Group:         X11/XFree86
 %if %{need_x86}
 Source0:       http://www2.ati.com/drivers/linux/fglrx_6_8_0-%{version}-1.i386.rpm
-# Source0-md5: 9c6397047331aadaa2c379ca78245810
+# Source0-md5: db413c61d9d00a96c6a103fe9cf697d5
 %endif
 %if %{need_amd64}
-Source1:       http://www2.ati.com/drivers/linux/fglrx64_6_8_0-%{version}-1.x86_64.rpm
-# Source1-md5: a54abd8af43d3066faccda4cecec851c
+Source1:       http://www2.ati.com/drivers/linux/64bit/fglrx64_6_8_0-%{version}-1.x86_64.rpm
+# Source1-md5: 71524b4690b1df108c2cc5d37f945856
 %endif
 Patch0:                firegl-panel.patch
 Patch1:                firegl-panel-ugliness.patch
-Patch2:                %{name}-kernel-2_6_11.patch
-Patch3:                %{name}-kh.patch
-Patch4:                %{name}-viak8t.patch
+Patch2:                %{name}-kh.patch
+Patch3:                %{name}-viak8t.patch
 URL:           http://www.ati.com/support/drivers/linux/radeon-linux.html
 BuildRequires: cpio
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
-BuildRequires: rpmbuild(macros) >= 1.153
+BuildRequires: rpmbuild(macros) >= 1.213
 %{?with_userspace:BuildRequires:       qt-devel}
 #BuildRequires:        X11-devel >= %{_min_x11}        # disabled for now
 Requires:      X11-OpenGL-core >= %{_min_x11}
 Requires:      X11-Xserver
-Requires:      X11-driver-firegl(kernel)
+%{?with_kernel:Requires:       X11-driver-firegl(kernel)}
 Requires:      X11-libs >= %{_min_x11}
 Requires:      X11-modules >= %{_min_x11}
 Provides:      X11-OpenGL-libGL
@@ -63,7 +62,7 @@ Obsoletes:    Mesa
 Obsoletes:     X11-OpenGL-libGL
 Obsoletes:     XFree86-OpenGL-libGL
 Obsoletes:     XFree86-driver-firegl
-ExclusiveArch: i586 i686 athlon pentium3 pentium4 amd64
+ExclusiveArch: i586 i686 athlon pentium3 pentium4 %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautoreqdep   libGL.so.1
@@ -118,7 +117,7 @@ Modu
 
 %prep
 %setup -q -c -T
-%ifarch amd64
+%ifarch %{x8664}
 rpm2cpio %{SOURCE1} | cpio -i -d
 %else
 rpm2cpio %{SOURCE0} | cpio -i -d
@@ -128,9 +127,8 @@ tar -xzf usr/src/ATI/fglrx_panel_sources.tgz -C panel_src
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%{?with_dist_kernel:%patch3 -p1}
-%patch4 -p1
+%{?with_dist_kernel:%patch2 -p1}
+%patch3 -p1
 
 %build
 %if %{with kernel}
@@ -145,6 +143,7 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        ln -sf %{_kernelsrcdir}/config-$cfg .config
        ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
        ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+       ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
 %if %{without dist_kernel}
        ln -sf %{_kernelsrcdir}/scripts
 %endif
@@ -233,6 +232,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /usr/%{_lib}/libGL.so.1
 %attr(755,root,root) /usr/%{_lib}/libGL.so
 
+%attr(755,root,root) %{_libdir}/modules/dri/atiogl_a_dri.so
 %attr(755,root,root) %{_libdir}/modules/dri/fglrx_dri.so
 %attr(755,root,root) %{_libdir}/modules/drivers/fglrx_drv.o
 %{_libdir}/modules/linux/libfglrxdrm.a