SPECS: Mesa.spec - use x86-64 targets for x86_64 assembly - release 4

[qboosh]

Author: qboosh                       Date: Sun Dec  2 16:52:47 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use x86-64 targets for x86_64 assembly
- release 4

---- Files affected:
SPECS:
   Mesa.spec (1.163 -> 1.164) 

---- Diffs:

================================================================
Index: SPECS/Mesa.spec
diff -u SPECS/Mesa.spec:1.163 SPECS/Mesa.spec:1.164
--- SPECS/Mesa.spec:1.163	Sun Dec  2 17:26:15 2007
+++ SPECS/Mesa.spec	Sun Dec  2 17:52:42 2007
@@ -13,7 +13,7 @@
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
 Version:	7.0.2
-Release:	3.1%{?with_multigl:.mgl}
+Release:	4%{?with_multigl:.mgl}
 License:	MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:		X11/Libraries
 Source0:	http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
@@ -609,11 +609,18 @@
 %endif
 
 %build
+# use $lib, not %{_lib} as Mesa uses lib64 only for *-x86-64* targets
+%ifarch %{x8664}
+targ=-x86-64
+lib=lib64
+%else
+lib=lib
 %ifarch %{ix86}
 targ=-x86
 %else
 targ=""
 %endif
+%endif
 
 %{__make} linux${targ}-static \
 	CC="%{__cc}" \
@@ -623,7 +630,7 @@
 	GLW_SOURCES="GLwDrawA.c%{?with_motif: GLwMDrawA.c}" \
 	SRC_DIRS="mesa glu glw" \
 	PROGRAM_DIRS=
-mv -f lib lib-static
+mv -f ${lib} lib-static
 %{__make} realclean
 
 %{__make} linux-osmesa \
@@ -652,7 +659,7 @@
 	OPT_FLAGS="%{rpmcflags}" \
 	XLIB_DIR=%{_libdir} \
 	PROGS="glxgears" \
-	APP_LIB_DEPS="-L../../lib -lGL"
+	APP_LIB_DEPS="-L../../${lib} -lGL"
 
 %{__make} -C progs/xdemos \
 	CC="%{__cc}" \
@@ -660,9 +667,9 @@
 	OPT_FLAGS="%{rpmcflags}" \
 	XLIB_DIR=%{_libdir} \
 	PROGS="glxinfo" \
-	APP_LIB_DEPS="-L../../lib -lGL -L../../lib-dri -lGLU"
+	APP_LIB_DEPS="-L../../${lib} -lGL -lGLU"
 
-mv -f lib lib-dri
+mv -f ${lib} lib-dri
 
 # TODO: glw.pc (missing in 7.0.2 tarball)
 for d in mesa glu ; do
@@ -907,6 +914,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.164  2007-12-02 16:52:42  qboosh
+- use x86-64 targets for x86_64 assembly
+- release 4
+
 Revision 1.163  2007-12-02 16:26:15  qboosh
 - moved libOSMesa.a to -static as it's usable only with non-dri libGL.a
 - build usable shared libOSMesa
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/Mesa.spec?r1=1.163&r2=1.164&f=u