SPECS: BillardGL.spec - added pl Comment to .desktop - dropped /us...

[qboosh]

Author: qboosh                       Date: Tue Feb  5 19:09:47 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added pl Comment to .desktop
- dropped /usr/X11R6/lib from linking, use metapackage name for glut
- pass CXX and optflags

---- Files affected:
SPECS:
   BillardGL.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/BillardGL.spec
diff -u SPECS/BillardGL.spec:1.16 SPECS/BillardGL.spec:1.17
--- SPECS/BillardGL.spec:1.16	Sun Jan 27 00:38:08 2008
+++ SPECS/BillardGL.spec	Tue Feb  5 20:09:42 2008
@@ -1,12 +1,11 @@
 # $Revision$, $Date$
-Name:		BillardGL
 Summary:	3D billard simulation using OpenGL
 Summary(pl.UTF-8):	Symulacja bilarda używająca OpenGL
+Name:		BillardGL
 Version:	1.75
 Release:	3
 Group:		X11/Applications/Games
 License:	GPL
-Vendor:		University of Freiburg / Germany
 Source0:	http://billardgl.sourceforge.net/download/%{name}-%{version}.tar.gz
 # Source0-md5:	46f2cf99e1a2b2aa4707d3500e43be47
 Source1:	%{name}.desktop
@@ -15,7 +14,7 @@
 Patch1:		%{name}-depracted.patch
 Patch2:		%{name}-config_buffer_overflows.patch
 URL:		http://www.tobias-nopper.de/BillardGL/
-BuildRequires:	freeglut-devel
+BuildRequires:	OpenGL-glut-devel
 BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libXi-devel
 BuildRequires:	xorg-lib-libXmu-devel
@@ -33,11 +32,15 @@
 %patch1 -p1
 %patch2 -p1
 
+sed -i -e "s:-L/usr/X11R6/lib::" src/Makefile
+sed -i -e "s:/usr/share/:%{_datadir}/:" src/Namen.h
+
 %build
-cd src
-sed -i -e "s:/usr/X11R6/lib:/usr/X11R6/%{_lib}:g" Makefile
-sed -i -e "s:/usr/share/:%{_datadir}/:" Namen.h
-%{__make}
+%{__make} -C src \
+	CXX="%{__cxx}" \
+	CXXFLAGS="%{rpmcxxflags} -Wall -W %{!?debug:-DNO_DEBUG}" \
+	LINK="%{__cxx}" \
+	LFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -72,6 +75,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2008-02-05 19:09:42  qboosh
+- added pl Comment to .desktop
+- dropped /usr/X11R6/lib from linking, use metapackage name for glut
+- pass CXX and optflags
+
 Revision 1.16  2008-01-26 23:38:08  cactus
 - icon and desktop file
 - rel 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/BillardGL.spec?r1=1.16&r2=1.17&f=u