X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=foobillard.spec;h=7e94d5300dbe736fa3db0905e1ed39d4958c2f6c;hb=2b57fe500a5d3e8ba8d6699f6488d3d621a769ae;hp=25ee7fb611c066e810edc33e8c5e99c5545f2e42;hpb=c55fc42f1b99c3c6d216b0075e09c187c320feaa;p=packages%2Ffoobillard.git

diff --git a/foobillard.spec b/foobillard.spec
index 25ee7fb..7e94d53 100644
--- a/foobillard.spec
+++ b/foobillard.spec
@@ -1,24 +1,35 @@
+#
+# Conditional build:
+%bcond_with	glut	# use glut instead of SDL
+%bcond_with	nvidia	# enable NVidia specific extensions
+#
 Summary:	A free OpenGL game of playing billard
 Summary(pl):	Wolnodostêpna gra w bilard oparta na OpenGL
 Name:		foobillard
-Version:	2.3
-Release:	1
-Vendor:		Florian Berger (florian.berger@aec.at,harpin_floh@yahoo.de)
+Version:	3.0a
+Release:	1	
+Vendor:		Florian Berger <florian.berger@aec.at>, <harpin_floh@yahoo.de>
 License:	GPL
 Group:		X11/Applications/Games
 Source0:	http://foobillard.sunsite.dk/dnl/%{name}-%{version}.tar.gz
+# Source0-md5:	c2d92edeaaf8bfb18aa26f1c79931b7d
 Source1:	%{name}.desktop
 Source2:	%{name}.xpm
-Patch0:		%{name}-include.patch
 URL:		http://foobillard.sunsite.dk/
-BuildRequires:	SDL-devel
+BuildRequires:	OpenGL-devel
+%{!?with_glut:BuildRequires:	SDL-devel}
+%{?with_nvidia:BuildRequires:	XFree86-driver-nvidia}
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	freetype-devel
-BuildRequires:	gettext-devel
+%{?with_glut:BuildRequires:	glut-devel}
 BuildRequires:	intltool
+BuildRequires:	libtool
+Requires:	OpenGL
+%{?with_nvidia:Requires:	XFree86-driver-nvidia}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_noautoreqdep	libGL.so.1 libGLU.so.1
 
 %description
 FooBillard is an attempt to create a free OpenGL-billard for Linux.
@@ -41,30 +52,30 @@ nieco r
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 rm -f missing
 X_LIBS='-I/usr/X11R6/include'; export X_LIBS
 %{__libtoolize}
-%{__gettextize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure --enable-SDL
+%configure \
+	%{!?with_glut:--enable-SDL}%{?with_glut:--enable-glut} \
+	%{!?with_nvidia:--disable-nvidia}%{?with_nvidia:--enable-nvidia}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Games,%{_pixmapsdir}}
-
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Games
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -73,5 +84,5 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS NEWS README ChangeLog TODO README.FONTS foobillardrc.example
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/foobillard
-%{_applnkdir}/Games/%{name}.desktop
+%{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/*