[foobillard] Fix cloth.

[Jon Ciesla]

commit 205fb447e174245b79365d9ea28823fc25a12c37
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Mar 7 20:36:11 2012 -0600

    Fix cloth.

 foobillard-3.0a-clothtex.patch |   13 +++++++++++++
 foobillard.spec                |   12 +++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/foobillard-3.0a-clothtex.patch b/foobillard-3.0a-clothtex.patch
new file mode 100644
index 0000000..9ba236d
--- /dev/null
+++ b/foobillard-3.0a-clothtex.patch
@@ -0,0 +1,13 @@
+--- src/table.c~	2004-01-11 15:53:02.000000000 -0600
++++ src/table.c	2012-03-07 20:29:01.551145717 -0600
+@@ -1214,8 +1214,8 @@
+                           GL_UNSIGNED_BYTE, tabletexdata);
+         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, options_tex_min_filter);
+         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, options_tex_mag_filter);
+-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
++        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
++        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+         free( tabletexdata );
+     } else {
+         tabletexbind=0;
diff --git a/foobillard.spec b/foobillard.spec
index ea5f2c9..d4b7b82 100644
--- a/foobillard.spec
+++ b/foobillard.spec
@@ -1,6 +1,6 @@
 Name:           foobillard
 Version:        3.0a
-Release:        16%{?dist}
+Release:        17%{?dist}
 
 Summary:        OpenGL billard game
 
@@ -13,10 +13,11 @@ Source1:        foobillard.desktop
 Source2:        hobble-foobillard.sh
 Patch0:         foobillard-3.0a-nonv.patch
 Patch1:         foobillard-3.0a-no-fonts.patch
+Patch2:		foobillard-3.0a-clothtex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       dejavu-sans-fonts
 BuildRequires:  SDL-devel ImageMagick alsa-lib-devel
-BuildRequires:  freetype-devel libpng-devel perl zlib-devel
+BuildRequires:  freetype-devel libpng-devel perl zlib-devel freeglut-devel
 BuildRequires:  libGL-devel libGLU-devel libX11-devel libXaw-devel libXi-devel
 
 %description
@@ -28,11 +29,12 @@ FooBillard is still under development but the main physics is implemented.
 %setup -q -n foobillard-3.0a
 %patch0 -p1
 %patch1 -p1 -b .no-fonts
+%patch2 -p0 -b .clothtex
 
 %build
 iconv -f iso-8859-1 -t utf-8 < ChangeLog > _
 mv _ ChangeLog
-%configure --disable-nvidia CFLAGS="${RPM_OPT_FLAGS}"
+%configure --disable-nvidia --enable-glut CFLAGS="${RPM_OPT_FLAGS}"
 make %{?_smp_mflags}
 convert -resize 48 data/foobillard.png foobillard.png
 
@@ -65,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar 07 2012 Jon Ciesla <limburgher at gmail.com> - 3.0a-17
+- Patch to fix cloth texture, BZ 709202.
+- Build with glut.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0a-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild