[xscreensaver/f18] Remove warning from calling glLighti with float argument in engine.c

[Mamoru Tasaka]

commit 673dcb36ce2e543b404f172dbeb85c3d68451b5b
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Mon Aug 27 12:56:26 2012 +0900

    Remove warning from calling glLighti with float argument in engine.c

 xscreensaver-5.19-engine-clangwarn.patch |   11 +++++++++++
 xscreensaver.spec                        |    8 +++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/xscreensaver-5.19-engine-clangwarn.patch b/xscreensaver-5.19-engine-clangwarn.patch
new file mode 100644
index 0000000..17715cf
--- /dev/null
+++ b/xscreensaver-5.19-engine-clangwarn.patch
@@ -0,0 +1,11 @@
+--- xscreensaver-5.19-clang/hacks/glx/engine.c.clang	2012-08-23 23:58:19.000000000 +0900
++++ xscreensaver-5.19-clang/hacks/glx/engine.c	2012-08-24 00:01:13.000000000 +0900
+@@ -587,7 +587,7 @@
+   glLightfv(GL_LIGHT1, GL_POSITION, e->boom_lpos);
+   glLightfv(GL_LIGHT1, GL_DIFFUSE, e->boom_red);
+   glLightfv(GL_LIGHT1, GL_SPECULAR, e->boom_red);
+-  glLighti(GL_LIGHT1, GL_LINEAR_ATTENUATION, 1.3);
++  glLightf(GL_LIGHT1, GL_LINEAR_ATTENUATION, 1.3);
+   glLighti(GL_LIGHT1, GL_CONSTANT_ATTENUATION, 0);
+ 
+   glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, e->boom_red);
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 1427aec..005273e 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    3
+%define fedora_rel    4
 
 %undefine extrarel
 
@@ -68,6 +68,8 @@ Patch32:         xscreensaver-5.13-dpmsQuickoff-japo.patch
 Patch33:         xscreensaver-5.19-lament-wireframe.patch
 # Fix improper and operator on flurry detected by llvm-clang
 Patch34:         xscreensaver-5.19-flurry-clangwarn.patch
+# Remove warning from calling glLighti with float argument in engine.c
+Patch35:         xscreensaver-5.19-engine-clangwarn.patch
 # driver/test-passwd tty segfaults
 Patch41:         xscreensaver-5.12-test-passwd-segv-tty.patch
 # patch to compile driver/test-xdpms
@@ -266,6 +268,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch32 -p1 -b .dpmsoff_japo
 %patch33 -p1 -b .wire
 %patch34 -p1 -b .andand
+%patch35 -p1 -b .fl_int
 %patch41 -p1 -b .test_passwd
 %patch42 -p1 -b .test_misc
 %patch43 -p1 -b .hndl_extra
@@ -819,6 +822,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Aug 27 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.19-4
+- Remove warning from calling glLighti with float argument in engine.c
+
 * Thu Aug 23 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.19-3
 - More fix on bug 849961 (lament -no-texture)