SPECS: X11-driver-firegl.spec - fixes from Patryk Szczygłowski

[arekm]

Author: arekm                        Date: Sat Dec 31 16:59:28 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixes from Patryk Szczygłowski

---- Files affected:
SPECS:
   X11-driver-firegl.spec (1.113 -> 1.114) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-firegl.spec
diff -u SPECS/X11-driver-firegl.spec:1.113 SPECS/X11-driver-firegl.spec:1.114
--- SPECS/X11-driver-firegl.spec:1.113	Sat Dec 31 09:55:52 2005
+++ SPECS/X11-driver-firegl.spec	Sat Dec 31 17:59:23 2005
@@ -1,9 +1,6 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-#
-# TODO: fix Source0 and Source1
-#
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	smp		# don't build SMP module
@@ -13,7 +10,7 @@
 
 %define		_min_eq_x11	1:6.9.0
 %define		_max_x11	1:7.0.0
-%define		arch_sufix	x690
+%define		x11ver		x690
 
 %if %{without kernel}
 %undefine with_dist_kernel
@@ -29,13 +26,14 @@
 %define		arch_sufix	_64a
 %else
 %define		need_amd64	0%{?with_incall:1}
+%define		arch_sufix	""
 %endif
 
 Summary:	Linux Drivers for ATI graphics accelerators
 Summary(pl):	Sterowniki do akceleratorów graficznych ATI
 Name:		X11-driver-firegl
 Version:	8.20.8
-%define		_rel	1.1
+%define		_rel	2
 Release:	%{_rel}
 License:	ATI Binary (parts are GPL)
 Vendor:		ATI
@@ -45,7 +43,7 @@
 # Source0-md5:	d3cd0788936d57c2b6734449c66987f8
 %endif
 %if %{need_amd64}
-Source1:	http://dlmdownloads.ati.com/drivers/linux/ati-driver-installer-%{version}-x86_64.run
+Source1:	http://dlmdownloads.ati.com/drivers/linux/64bit/ati-driver-installer-%{version}-x86_64.run
 # Source1-md5:	1ffc8dfe93db24fa18f3dd387e20bbcd
 %endif
 Source2:	%{name}-fglrx_pp_proto.h
@@ -134,7 +132,7 @@
 sh %{SOURCE0} --extract .
 %endif
 
-cp -a %{arch_sufix}/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/build_mod
+cp %{x11ver}%{arch_sufix}/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/build_mod
 
 install -d panel_src
 tar -xzf common/usr/src/ATI/fglrx_panel_sources.tgz -C panel_src
@@ -147,8 +145,8 @@
 cd -
 
 install -d common%{_prefix}/{%{_lib},bin}
-cp -r %{arch_sufix}%{_prefix}/%{_lib}/* common%{_prefix}/%{_lib}
-cp -r %{arch_sufix}%{_bindir}/* common%{_bindir}
+cp -r %{x11ver}%{arch_sufix}%{_prefix}/%{_lib}/* common%{_prefix}/%{_lib}
+cp -r %{x11ver}%{arch_sufix}%{_bindir}/* common%{_bindir}
 
 %build
 %if %{with kernel}
@@ -290,6 +288,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2005/12/31 16:59:23  arekm
+- fixes from Patryk Szczygłowski
+
 Revision 1.113  2005/12/31 08:55:52  ciesiel
 - upgraded to new X.org 6.9.0 (by patryk szczyglowski and some fixes)
 - TODO
================================================================

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