X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=BillardGL.spec;h=0138ac4983ded243cab3cd67e1e8ea6c1451594e;hb=HEAD;hp=db759604780877f47bc432694d7da08a5403d72a;hpb=8d55392d0ec0b2c2360b9627af8756cf79e0ba1b;p=packages%2FBillardGL.git

diff --git a/BillardGL.spec b/BillardGL.spec
index db75960..0138ac4 100644
--- a/BillardGL.spec
+++ b/BillardGL.spec
@@ -1,18 +1,20 @@
-Name:		BillardGL
 Summary:	3D billard simulation using OpenGL
 Summary(pl.UTF-8):	Symulacja bilarda używająca OpenGL
+Name:		BillardGL
 Version:	1.75
-Release:	2
-Group:		X11/Applications/Games
+Release:	3
 License:	GPL
-Vendor:		University of Freiburg / Germany
+Group:		X11/Applications/Games
 Source0:	http://billardgl.sourceforge.net/download/%{name}-%{version}.tar.gz
 # Source0-md5:	46f2cf99e1a2b2aa4707d3500e43be47
+Source1:	%{name}.desktop
+Source2:	%{name}.xpm
 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:	rpmbuild(macros) >= 1.167
 BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libXi-devel
 BuildRequires:	xorg-lib-libXmu-devel
@@ -30,19 +32,25 @@ 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
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/lang,%{_datadir}/%{name}/Texturen/{1,2,4,8}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir},%{_datadir}/%{name}/lang,%{_datadir}/%{name}/Texturen/{1,2,4,8}}
 
 cd src
 install BillardGL $RPM_BUILD_ROOT%{_bindir}
 install lang/*.lang $RPM_BUILD_ROOT%{_datadir}/%{name}/lang
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 for j in 1 2 4 8 ; do
 	for i in Texturen/$j/*; do
@@ -58,3 +66,5 @@ rm -rf $RPM_BUILD_ROOT
 %doc src/README
 %attr(755,root,root) %{_bindir}/BillardGL
 %{_datadir}/%{name}
+%{_desktopdir}/*.desktop
+%{_pixmapsdir}/*.xpm