- attempted to fix building on amd64

- STBR test

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

diff --git a/X11-driver-firegl.spec b/X11-driver-firegl.spec
index 291383df6db11e27e799fa7a314cb5ec9c3bf1f4..040538bddfa3581f2b59951cba4a306f85e7a141 100644 (file)
--- a/X11-driver-firegl.spec
+++ b/X11-driver-firegl.spec
@@ -5,6 +5,7 @@
 %bcond_without smp             # don't build SMP module
 %bcond_without userspace       # don't build userspace tools
 %bcond_with    verbose         # verbose build (V=1)
+%bcond_without incall          # include all sources in srpm
 
 %define                _min_x11        6.8.0
 
@@ -12,6 +13,30 @@
 %undefine with_dist_kernel
 %endif
 
+%define                need_x86        0
+%define                need_amd64      0
+
+%if %{with incall}
+
+%define                need_x86        1
+%define                need_amd64      1
+
+%else
+
+%ifarch amd64
+
+%define                need_amd64      1
+
+%endif
+
+%ifarch %{ix86}
+
+%define                need_x86        1
+
+%endif
+
+%endif
+
 Summary:       Linux Drivers for ATI graphics accelerators
 Summary(pl):   Sterowniki do akceleratorów graficznych ATI
 Name:          X11-driver-firegl
@@ -21,11 +46,11 @@ Release:    %{_rel}
 License:       ATI Binary (parts are GPL)
 Vendor:                ATI
 Group:         X11/XFree86
-%ifarch        %{ix86}
+%if    %{need_x86}
 Source0:       http://www2.ati.com/drivers/linux/fglrx_6_8_0-%{version}-1.i386.rpm
 # Source0-md5: a3ddb544071b1878ed19984c60623346
 %endif
-%ifarch        amd64
+%if    %{need_amd64}
 Source1:       http://www2.ati.com/drivers/linux/fglrx64_6_8_0-%{version}-1.x86_64.rpm
 # Source1-md5: ca724fda36ecf6c8a60a74e3a1528829
 %endif
@@ -39,7 +64,6 @@ BuildRequires:        cpio
 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)