- removed %%gettextize (it isn't necessary and it breaks building)

- added --with_glut bcond
- rel. 2

Changed files:
    foobillard.spec -> 1.6

diff --git a/foobillard.spec b/foobillard.spec
index 25ee7fb611c066e810edc33e8c5e99c5545f2e42..348b692127ca83f65e5c39447485771070d1abde 100644 (file)
--- a/foobillard.spec
+++ b/foobillard.spec
@@ -1,8 +1,12 @@
+#
+# Conditional build:
+# _with_glut   use glut instead of SDL-lib
+
 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
+Release:       2
 Vendor:                Florian Berger (florian.berger@aec.at,harpin_floh@yahoo.de)
 License:       GPL
 Group:         X11/Applications/Games
@@ -11,15 +15,15 @@ Source1:    %{name}.desktop
 Source2:       %{name}.xpm
 Patch0:                %{name}-include.patch
 URL:           http://foobillard.sunsite.dk/
-BuildRequires: SDL-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: freetype-devel
-BuildRequires: gettext-devel
 BuildRequires: intltool
+%{?_with_glut:BuildRequires:   glut-devel}
+%{?_with_glut:BuildRequires:   OpenGL-devel}
+%{!?_with_glut:BuildRequires:  SDL-devel}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-
 %description
 FooBillard is an attempt to create a free OpenGL-billard for Linux.
 Why foo? Well, actually I had this logo (F.B.-Florian Berger) and then
@@ -47,11 +51,11 @@ nieco r
 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}
 
 %{__make}