- added driver for AMD64

- changed BR from kernel-source to kernel-module-build
- changes made by sebastian at oclab.ano.pl
- release 2; STBR now please...

Changed files:
    X11-driver-firegl.spec -> 1.74

diff --git a/X11-driver-firegl.spec b/X11-driver-firegl.spec
index 471f7c4a00f1a12b2e1015af53c7d8a378fd6ed1..81b55359eb255fa2f4889f8ae0e50c95691687fc 100644 (file)
--- a/X11-driver-firegl.spec
+++ b/X11-driver-firegl.spec
@@ -12,19 +12,21 @@ 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    1
+%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
+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
 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
@@ -39,7 +41,7 @@ Obsoletes:    Mesa
 Obsoletes:     X11-OpenGL-libGL
 Obsoletes:     XFree86-OpenGL-libGL
 Obsoletes:     XFree86-driver-firegl
-ExclusiveArch: i586 i686 athlon pentium3 pentium4
+ExclusiveArch: i586 i686 athlon pentium3 pentium4 amd64
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautoreqdep   libGL.so.1
@@ -47,6 +49,10 @@ 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
@@ -94,7 +100,11 @@ Modu
 
 %prep
 %setup -q -c -T
+%ifarch amd64
+rpm2cpio %{SOURCE1} | cpio -i -d
+%else
 rpm2cpio %{SOURCE0} | cpio -i -d
+%endif
 install -d panel_src
 tar -xzf usr/src/ATI/fglrx_panel_sources.tgz -C panel_src
 %patch0 -p1
@@ -158,7 +168,11 @@ 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
 
 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so