SPECS: X11-driver-firegl.spec - 8.28.8 (partial merge from xorg-dr...

[glen]

Author: glen                         Date: Thu Aug 31 18:17:40 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 8.28.8 (partial merge from xorg-driver-video-fglrx.spec)

---- Files affected:
SPECS:
   X11-driver-firegl.spec (1.128 -> 1.129) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-firegl.spec
diff -u SPECS/X11-driver-firegl.spec:1.128 SPECS/X11-driver-firegl.spec:1.129
--- SPECS/X11-driver-firegl.spec:1.128	Thu Aug 31 19:38:36 2006
+++ SPECS/X11-driver-firegl.spec	Thu Aug 31 20:17:34 2006
@@ -17,13 +17,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
@@ -32,19 +28,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
@@ -122,11 +111,7 @@
 %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
 
@@ -282,6 +267,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129  2006/08/31 18:17:34  glen
+- 8.28.8 (partial merge from xorg-driver-video-fglrx.spec)
+
 Revision 1.128  2006/08/31 17:38:36  glen
 - make -j1 for scripts
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11-driver-firegl.spec?r1=1.128&r2=1.129&f=u