- added pl Comment to .desktop

- dropped /usr/X11R6/lib from linking, use metapackage name for glut
- pass CXX and optflags

Changed files:
    BillardGL.spec -> 1.17

diff --git a/BillardGL.spec b/BillardGL.spec
index cec32a1944b0c7898f3f418c9783c72fb89a4c57..3cae7de5e11451694a4d528c915a48974d451812 100644 (file)
--- a/BillardGL.spec
+++ b/BillardGL.spec
@@ -1,11 +1,10 @@
-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
@@ -14,7 +13,7 @@ Patch0:               %{name}-starting-resolution.patch
 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
@@ -32,11 +31,15 @@ Trójwymiarowa symulacja bilarda używająca OpenGL.
 %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