packages: glut/glut.spec - fix linking - BR: glew-devel - rel 20; STBR

[sparky]

Author: sparky                       Date: Wed Feb 24 19:57:58 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix linking
- BR: glew-devel
- rel 20; STBR

---- Files affected:
packages/glut:
   glut.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: packages/glut/glut.spec
diff -u packages/glut/glut.spec:1.63 packages/glut/glut.spec:1.64
--- packages/glut/glut.spec:1.63	Sun Feb 17 02:24:10 2008
+++ packages/glut/glut.spec	Wed Feb 24 20:57:53 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	OpenGL Utility Toolkit (GLUT) - toolkit graficzny do używania z OpenGL
 Name:		glut
 Version:	3.7
-Release:	19
+Release:	20
 License:	distributable
 Group:		Libraries
 Source0:	http://www.opengl.org/resources/libraries/glut/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@
 URL:		http://www.opengl.org/resources/libraries/glut.html
 BuildRequires:	/bin/csh
 BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	glew-devel
 BuildRequires:	xorg-cf-files >= 1.0.1-0.3
 BuildRequires:	xorg-lib-libXi-devel
 BuildRequires:	xorg-lib-libXmu-devel
@@ -90,27 +91,33 @@
 
 %{__make} -C lib/glut depend
 %{__make} -C lib/glut \
-	"BOOTSTRAPCFLAGS=%{rpmcflags} -fPIC" \
-	"CDEBUGFLAGS=" \
-	"CCOPTIONS=%{rpmcflags} -fPIC" \
-	"CXXDEBUGFLAGS=" \
-	"CXXOPTIONS=%{rpmcflags} -fPIC"
+	BOOTSTRAPCFLAGS="-Wall %{rpmcflags} -fPIC" \
+	CDEBUGFLAGS= \
+	CCOPTIONS="-Wall %{rpmcflags} -fPIC" \
+	CXXDEBUGFLAGS= \
+	CXXOPTIONS="-Wall %{rpmcflags} -fPIC" \
+	CC="%{__cc}" \
+	LDFLAGS="%{rpmldflags}"
 
 #make libglsmap.a
 %{__make} -C lib/glsmap \
-	"BOOTSTRAPCFLAGS=%{rpmcflags}" \
-	"CDEBUGFLAGS=" \
-	"CCOPTIONS=%{rpmcflags}" \
-	"CXXDEBUGFLAGS=" \
-	"CXXOPTIONS=%{rpmcflags}"
+	BOOTSTRAPCFLAGS="-Wall %{rpmcflags}" \
+	CDEBUGFLAGS= \
+	CCOPTIONS="-Wall %{rpmcflags}" \
+	CXXDEBUGFLAGS= \
+	CXXOPTIONS="-Wall %{rpmcflags}" \
+	CC="%{__cc}" \
+	LDFLAGS="%{rpmldflags}"
 
 #make libmui.a
 %{__make} -C lib/mui \
-	"BOOTSTRAPCFLAGS=%{rpmcflags}" \
-	"CDEBUGFLAGS=" \
-	"CCOPTIONS=%{rpmcflags}" \
-	"CXXDEBUGFLAGS=" \
-	"CXXOPTIONS=%{rpmcflags}"
+	BOOTSTRAPCFLAGS="-Wall %{rpmcflags}" \
+	CDEBUGFLAGS= \
+	CCOPTIONS="-Wall %{rpmcflags}" \
+	CXXDEBUGFLAGS= \
+	CXXOPTIONS="-Wall %{rpmcflags}" \
+	CC="%{__cc}" \
+	LDFLAGS="%{rpmldflags}"
 
 #prepare to make manuals
 cd man
@@ -178,6 +185,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2010/02/24 19:57:53  sparky
+- fix linking
+- BR: glew-devel
+- rel 20; STBR
+
 Revision 1.63  2008/02/17 01:24:10  qboosh
 - removed man pages from -devel (moved to OpenGL-doc-man, common for all GL impls)
 - release 19
@@ -392,5 +404,3 @@
 Revision 1.1  2000/04/05 06:46:39  cieciwa
 - initial spec.
 
-* Thu Oct  7 1999 Wojciech "Sas" Cięciwa <cieciwa at alpha.zarz.agh.edu.pl>
--Build RPM.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glut/glut.spec?r1=1.63&r2=1.64&f=u