- build locker

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

diff --git a/X11-driver-firegl.spec b/X11-driver-firegl.spec
index 81b55359eb255fa2f4889f8ae0e50c95691687fc..291383df6db11e27e799fa7a314cb5ec9c3bf1f4 100644 (file)
--- a/X11-driver-firegl.spec
+++ b/X11-driver-firegl.spec
@@ -8,28 +8,38 @@
 
 %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
+Version:       8.10.19
 %define                _rel    2
 Release:       %{_rel}
 License:       ATI Binary (parts are GPL)
 Vendor:                ATI
 Group:         X11/XFree86
-Source0:        http://www2.ati.com/drivers/linux/fglrx_6_8_0-%{version}-1.i386.rpm
-# Source0-md5:  8245afc1a5f83634ab1b906b8107cd0c
-Source1:        http://www2.ati.com/drivers/linux/fglrx64_6_8_0-%{version}-1.x86_64.rpm
-# Source1-md5:  4967e36a1bdf275a37251605b6a2356c
+%ifarch        %{ix86}
+Source0:       http://www2.ati.com/drivers/linux/fglrx_6_8_0-%{version}-1.i386.rpm
+# Source0-md5: a3ddb544071b1878ed19984c60623346
+%endif
+%ifarch        amd64
+Source1:       http://www2.ati.com/drivers/linux/fglrx64_6_8_0-%{version}-1.x86_64.rpm
+# Source1-md5: ca724fda36ecf6c8a60a74e3a1528829
+%endif
 Patch0:                firegl-panel.patch
 Patch1:                firegl-panel-ugliness.patch
-Patch2:                %{name}-kh.patch
+Patch2:                %{name}-kernel-2_6_11.patch
+Patch3:                %{name}-kh.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
 %{?with_userspace:BuildRequires:       qt-devel}
 #BuildRequires:        X11-devel >= %{_min_x11}        # disabled for now
+BuildRequires: fix_amd64_build
 Requires:      X11-OpenGL-core >= %{_min_x11}
 Requires:      X11-Xserver
 Requires:      X11-driver-firegl(kernel)
@@ -49,10 +59,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
 the FireGL 8700/8800, E1, Z1/X1 graphics accelerators. This package
@@ -107,9 +113,11 @@ rpm2cpio %{SOURCE0} | cpio -i -d
 %endif
 install -d panel_src
 tar -xzf usr/src/ATI/fglrx_panel_sources.tgz -C panel_src
+
 %patch0 -p1
 %patch1 -p1
-%{?with_dist_kernel:%patch2 -p1}
+%patch2 -p1
+%{?with_dist_kernel:%patch3 -p1}
 
 %build
 %if %{with kernel}
@@ -124,6 +132,9 @@ 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
+%if %{without dist_kernel}
+       ln -sf %{_kernelsrcdir}/scripts
+%endif
        touch include/config/MARKER
        %{__make} -C %{_kernelsrcdir} clean \
                RCS_FIND_IGNORE="-name '*.ko' -o" \
@@ -168,11 +179,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