- 8.28.8 (partial merge from xorg-driver-video-fglrx.spec)

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

diff --git a/X11-driver-firegl.spec b/X11-driver-firegl.spec
index 88f9ba5a18aedea2db1530ad7b9c3d51096be490..5cf850785edc2fe592ca601ec0122d9efb3adc49 100644 (file)
--- a/X11-driver-firegl.spec
+++ b/X11-driver-firegl.spec
@@ -16,13 +16,9 @@
 %endif
 
 %ifarch %{ix86}
-%define                need_x86        1
-%define                need_amd64      0%{?with_incall:1}
 %define                arch_sufix      ""
 %define                arch_dir        x86
 %else
-%define                need_x86        0%{?with_incall:1}
-%define                need_amd64      1
 %define                arch_sufix      _64a
 %define                arch_dir        x86_64
 %endif
@@ -31,19 +27,12 @@
 Summary:       Linux Drivers for ATI graphics accelerators
 Summary(pl):   Sterowniki do akceleratorów graficznych ATI
 Name:          X11-driver-firegl
-Version:       8.27.10
-%define                _rel    1
+Version:       8.28.8
 Release:       %{_rel}
 License:       ATI Binary (parts are GPL)
 Group:         X11
-%if %{need_x86}
-Source0:       http://dlmdownloads.ati.com/drivers/linux/ati-driver-installer-%{version}-x86.run
-# Source0-md5: 72f69477c66d8b2d1a580c7885afa892
-%endif
-%if %{need_amd64}
-Source1:       http://dlmdownloads.ati.com/drivers/linux/64bit/ati-driver-installer-%{version}-x86_64.run
-# Source1-md5: 4cc78c0fc864fd2b3205cee5f866f3d7
-%endif
+Source0:       http://dlmdownloads.ati.com/drivers/linux/ati-driver-installer-%{version}.run
+# Source0-md5: 58189d7cc3625e399b1a434df893100f
 Patch0:                firegl-panel.patch
 Patch1:                firegl-panel-ugliness.patch
 Patch2:                %{name}-kh.patch
@@ -53,7 +42,7 @@ 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%{_alt_kernel}-module-build >= 3:2.6.14}
 %{?with_userspace:BuildRequires:       qt-devel}
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.308
 Requires:      X11-OpenGL-core >= %{_min_eq_x11}
 Requires:      X11-Xserver
 %{?with_kernel:Requires:       X11-driver-firegl(kernel)}
@@ -121,11 +110,7 @@ Modu
 %prep
 %setup -q -c -T
 
-%ifarch %{x8664}
-sh %{SOURCE1} --extract .
-%else
 sh %{SOURCE0} --extract .
-%endif
 
 cp arch/%{arch_dir}/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/build_mod
 
@@ -157,7 +142,7 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        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} O=$PWD/o prepare scripts -j1
        %{__make} -C %{_kernelsrcdir} clean \
                RCS_FIND_IGNORE="-name '*.ko' -o" \
                M=$PWD O=$PWD/o \