- merged changes from AC-branch

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

diff --git a/X11-driver-firegl.spec b/X11-driver-firegl.spec
index d8457739edd6800d8106b03967238f6c490f624c..d8ce567b595f6f8318d458bbcdcd6dd345ba53bd 100644 (file)
--- a/X11-driver-firegl.spec
+++ b/X11-driver-firegl.spec
@@ -31,22 +31,24 @@
 Summary:       Linux Drivers for ATI graphics accelerators
 Summary(pl):   Sterowniki do akceleratorów graficznych ATI
 Name:          X11-driver-firegl
-Version:       8.23.7
+Version:       8.24.8
+%define                _rel    1
 Release:       %{_rel}
 License:       ATI Binary (parts are GPL)
 Group:         X11
 %if %{need_x86}
-Source0:       http://dlmdownloads.ati.com/drivers/linux/ati-driver-installer-%{version}-i386.run
-# Source0-md5: 3cc417f243a227163ac8a73e3f467240
+Source0:       http://dlmdownloads.ati.com/drivers/linux/ati-driver-installer-%{version}-x86.run
+# Source0-md5: 03495fe2f7d54eb9cb0d230940194440
 %endif
 %if %{need_amd64}
 Source1:       http://dlmdownloads.ati.com/drivers/linux/64bit/ati-driver-installer-%{version}-x86_64.run
-# Source1-md5: 9b5b56edf50464a182f0b61586f19c23
+# Source1-md5: 347e818a4eb8fb11da2aa3ebcb31afd4
 %endif
 Patch0:                firegl-panel.patch
 Patch1:                firegl-panel-ugliness.patch
 Patch2:                %{name}-kh.patch
 Patch3:                %{name}-viak8t.patch
+Patch4:                %{name}-force-define-AGP.patch
 URL:           http://www.ati.com/support/drivers/linux/radeon-linux.html
 #BuildRequires:        X11-devel >= %{_min_eq_x11}     # disabled for now
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 3:2.6.14}
@@ -134,6 +136,7 @@ tar -xzf common/usr/src/ATI/fglrx_panel_sources.tgz -C panel_src
 cd common
 %{?with_dist_kernel:%patch2 -p1}
 %patch3 -p1
+%patch4 -p2
 cd -
 
 install -d common%{_prefix}/{%{_lib},bin}
@@ -150,11 +153,11 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
                exit 1
        fi
-               install -d o/include/linux
-               ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-               ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-               ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-               %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+       install -d o/include/linux
+       ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+       ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+       ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+       %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
        %{__make} -C %{_kernelsrcdir} clean \
                RCS_FIND_IGNORE="-name '*.ko' -o" \
                M=$PWD O=$PWD/o \