rpms/libcaca/devel libcaca-0.99.beta16-libGLU.patch, NONE, 1.1 libcaca.spec, 1.19, 1.20

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/libcaca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30238

Modified Files:
	libcaca.spec 
Added Files:
	libcaca-0.99.beta16-libGLU.patch 
Log Message:
Fix build now that glut no longer links against libGLU (#502296).


libcaca-0.99.beta16-libGLU.patch:

--- NEW FILE libcaca-0.99.beta16-libGLU.patch ---
diff -Naupr libcaca-0.99.beta16.orig/caca/driver/gl.c libcaca-0.99.beta16/caca/driver/gl.c
--- libcaca-0.99.beta16.orig/caca/driver/gl.c	2008-09-27 17:58:05.000000000 +0200
+++ libcaca-0.99.beta16/caca/driver/gl.c	2009-06-11 12:40:36.197533250 +0200
@@ -27,6 +27,7 @@
 #   include <GLUT/glut.h>
 #else
 #   include <GL/gl.h>
+#   include <GL/glu.h>
 #   include <GL/glut.h>
 #   include <GL/freeglut_ext.h>
 #endif
diff -Naupr libcaca-0.99.beta16.orig/configure libcaca-0.99.beta16/configure
--- libcaca-0.99.beta16.orig/configure	2008-10-18 14:55:15.000000000 +0200
+++ libcaca-0.99.beta16/configure	2009-06-11 12:42:07.426595175 +0200
@@ -23859,7 +23859,7 @@ cat >>confdefs.h <<\_ACEOF
 #define USE_GL 1
 _ACEOF
 
-    GL_LIBS="${GL_LIBS} -lGL -lglut"
+    GL_LIBS="${GL_LIBS} -lGL -lGLU -lglut"
     CACA_DRIVERS="${CACA_DRIVERS} gl"
   elif test "${enable_gl}" = "yes"; then
     { { echo "$as_me:$LINENO: error: cannot find OpenGL+FreeGLUT development files" >&5
diff -Naupr libcaca-0.99.beta16.orig/configure.ac libcaca-0.99.beta16/configure.ac
--- libcaca-0.99.beta16.orig/configure.ac	2008-10-18 14:54:11.000000000 +0200
+++ libcaca-0.99.beta16/configure.ac	2009-06-11 12:41:42.885595337 +0200
@@ -223,7 +223,7 @@ if test "${enable_gl}" != "no"; then
       break])
   if test "${ac_cv_my_have_gl}" = "yes"; then
     AC_DEFINE(USE_GL, 1, Define to 1 to activate the OpenGL backend driver)
-    GL_LIBS="${GL_LIBS} -lGL -lglut"
+    GL_LIBS="${GL_LIBS} -lGL -lGLU -lglut"
     CACA_DRIVERS="${CACA_DRIVERS} gl"
   elif test "${enable_gl}" = "yes"; then
     AC_MSG_ERROR([cannot find OpenGL+FreeGLUT development files])


Index: libcaca.spec
===================================================================
RCS file: /cvs/extras/rpms/libcaca/devel/libcaca.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- libcaca.spec	25 Feb 2009 13:56:51 -0000	1.19
+++ libcaca.spec	11 Jun 2009 10:48:31 -0000	1.20
@@ -3,17 +3,19 @@
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
 Version: 0.99
-Release: 0.7.%{beta}%{?dist}
+Release: 0.8.%{beta}%{?dist}
 License: WTFPL
 Group: System Environment/Libraries
 URL: http://libcaca.zoy.org/
 Source: http://caca.zoy.org/raw-attachment/wiki/libcaca/libcaca-%{version}.%{beta}.tar.gz
 Patch0: libcaca-0.99.beta16-multilib.patch
+Patch1: libcaca-0.99.beta16-libGLU.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: slang-devel
 BuildRequires: ncurses-devel
 BuildRequires: libX11-devel
 BuildRequires: glut-devel
+BuildRequires: libGLU-devel
 BuildRequires: imlib2-devel
 BuildRequires: pango-devel
 # For the docs
@@ -35,6 +37,7 @@ Requires: slang-devel
 Requires: ncurses-devel
 Requires: libX11-devel
 Requires: glut-devel
+Requires: libGLU-devel
 Requires: imlib2-devel
 Requires: pango-devel
 
@@ -69,7 +72,8 @@ sprite blitting.
 
 %prep
 %setup -q -n libcaca-%{version}.%{beta}
-%patch0 -p1
+%patch0 -p1 -b .multilib
+%patch1 -p1 -b .libGLU
 
 
 %build
@@ -134,7 +138,10 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpa
 
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99-0.7.beta16
+* Thu Jun 11 2009 Matthias Saou <http://freshrpms.net/> 0.99-0.8.beta16
+- Fix build now that glut no longer links against libGLU (#502296).
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sun Dec 21 2008 Matthias Saou <http://freshrpms.net/> 0.99-0.6.beta16