- cleanups

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

diff --git a/X11-driver-firegl.spec b/X11-driver-firegl.spec
index b11e679a72f948bfe609d57ba776c466aa06c843..83d6da7172df51a42806945565bedc0d2b110ab3 100644 (file)
--- a/X11-driver-firegl.spec
+++ b/X11-driver-firegl.spec
@@ -1,8 +1,4 @@
 #
-#
-# TODO:
-# fix OpenGL on AMD64
-#
 # Conditional build:
 %bcond_without dist_kernel     # without distribution kernel
 %bcond_without kernel          # don't build kernel modules
@@ -12,25 +8,33 @@
 
 %define                _min_x11        6.8.0
 
+%if %{without kernel}
+%undefine with_dist_kernel
+%endif
+
 Summary:       Linux Drivers for ATI graphics accelerators
 Summary(pl):   Sterowniki do akceleratorów graficznych ATI
 Name:          X11-driver-firegl
-Version:       8.8.25
-%define                _rel    2
+Version:       8.10.19
+%define                _rel    1
 Release:       %{_rel}
 License:       ATI Binary (parts are GPL)
 Vendor:                ATI
 Group:         X11/XFree86
+%ifarch        %{ix86}
 Source0:       http://www2.ati.com/drivers/linux/fglrx_6_8_0-%{version}-1.i386.rpm
-# Source0-md5: 8245afc1a5f83634ab1b906b8107cd0c
+# Source0-md5: a3ddb544071b1878ed19984c60623346
+%endif
+%ifarch        amd64
 Source1:       http://www2.ati.com/drivers/linux/fglrx64_6_8_0-%{version}-1.x86_64.rpm
-# Source1-md5: 4967e36a1bdf275a37251605b6a2356c
+# Source1-md5: ca724fda36ecf6c8a60a74e3a1528829
+%endif
 Patch0:                firegl-panel.patch
 Patch1:                firegl-panel-ugliness.patch
 Patch2:                %{name}-kh.patch
 URL:           http://www.ati.com/support/drivers/linux/radeon-linux.html
 BuildRequires: cpio
-%{?with_dist_kernel:BuildRequires:     kernel-source >= 2.6.7}
+%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
 BuildRequires: rpmbuild(macros) >= 1.153
 %{?with_userspace:BuildRequires:       qt-devel}
 #BuildRequires:        X11-devel >= %{_min_x11}        # disabled for now
@@ -52,9 +56,6 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
-%ifarch amd64
-%define                _libdir32       %{_prefix}/lib
-%endif
 
 %description
 Display driver files for the ATI Radeon 8500, 9700, Mobility M9 and
@@ -152,13 +153,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
 cd lib/modules/fglrx/build_mod
-install -d $RPM_BUILD_ROOT/%{_libdir}/modules/%{_kernel_ver}{,smp}/misc
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 
 install fglrx-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-       $RPM_BUILD_ROOT/%{_libdir}/modules/%{_kernel_ver}/misc/fglrx.ko
+       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/fglrx.ko
 %if %{with smp} && %{with dist_kernel}
 install fglrx-smp.ko \
-       $RPM_BUILD_ROOT/%{_libdir}/modules/%{_kernel_ver}smp/misc/fglrx.ko
+       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/fglrx.ko
 %endif
 cd -
 %endif
@@ -171,11 +172,7 @@ install usr/X11R6/bin/{fgl_glxgears,fglrxconfig,fglrxinfo} \
        $RPM_BUILD_ROOT%{_bindir}
 install panel_src/fireglcontrol.qt3.gcc%(gcc -dumpversion) \
        $RPM_BUILD_ROOT%{_bindir}/fireglcontrol
-%ifarch amd64
-cp -r usr/X11R6/lib64/* $RPM_BUILD_ROOT%{_libdir}
-%else
-cp -r usr/X11R6/lib/* $RPM_BUILD_ROOT%{_libdir}
-%endif
+cp -r usr/X11R6/%{_lib}/* $RPM_BUILD_ROOT%{_libdir}
 
 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
 
@@ -232,11 +229,11 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with kernel}
 %files -n kernel-video-firegl
 %defattr(644,root,root,755)
-/%{_libdir}/modules/%{_kernel_ver}/misc/*.ko*
+/lib/modules/%{_kernel_ver}/misc/*.ko*
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-video-firegl
 %defattr(644,root,root,755)
-/%{_libdir}/modules/%{_kernel_ver}smp/misc/*.ko*
+/lib/modules/%{_kernel_ver}smp/misc/*.ko*
 %endif
 %endif