[quesoglc] Fix FTBFS (rhbz#716030)

Sat Jul 28 11:45:54 UTC 2012

commit 3ce366022c377a79d498f21643e411f105acebdf
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sat Jul 28 13:51:05 2012 +0200

    Fix FTBFS (rhbz#716030)
    
    - Fix multilib conflict (rhbz#831438)

 quesoglc-0.7.2-doxyfile.patch |   24 ++++++++++++++++++++
 quesoglc-0.7.2-glew-mx.patch  |   48 +++++++++++++++++++++++++++++++++++++++++
 quesoglc.spec                 |   26 ++++++++++++++-------
 3 files changed, 89 insertions(+), 9 deletions(-)
---

diff --git a/quesoglc-0.7.2-doxyfile.patch b/quesoglc-0.7.2-doxyfile.patch
new file mode 100644
index 0000000..d07e7ca
--- /dev/null
+++ b/quesoglc-0.7.2-doxyfile.patch
@@ -0,0 +1,24 @@
+diff -up quesoglc-0.7.2/docs/Doxyfile~ quesoglc-0.7.2/docs/Doxyfile
+--- quesoglc-0.7.2/docs/Doxyfile~	2008-03-09 02:03:15.000000000 +0100
++++ quesoglc-0.7.2/docs/Doxyfile	2012-07-28 13:44:53.950508309 +0200
+@@ -41,7 +41,7 @@ PROJECT_NAME           = QuesoGLC
+ # This could be handy for archiving the generated documentation or 
+ # if some version control system is used.
+ 
+-PROJECT_NUMBER         = Version 0.7.1
++PROJECT_NUMBER         = Version 0.7.2
+ 
+ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+ # base path where the generated documentation will be put. 
+diff -up quesoglc-0.7.2/docs/qfooter.html~ quesoglc-0.7.2/docs/qfooter.html
+--- quesoglc-0.7.2/docs/qfooter.html~	2008-03-08 21:39:05.000000000 +0100
++++ quesoglc-0.7.2/docs/qfooter.html	2012-07-28 13:45:36.120981158 +0200
+@@ -4,7 +4,7 @@
+           <td align="center" class="main">
+ 	    <hr>
+             <small>
+-              <font color="#cccccc">Generated on $datetime for $projectname by <a href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border=0></a> $doxygenversion written by Dimitri van Heesch &copy;&nbsp;1997-2005</font>
++              <font color="#cccccc">Generated for $projectname by <a href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border=0></a> $doxygenversion written by Dimitri van Heesch &copy;&nbsp;1997-2005</font>
+             </small>
+           </td>
+         </tr>
diff --git a/quesoglc-0.7.2-glew-mx.patch b/quesoglc-0.7.2-glew-mx.patch
new file mode 100644
index 0000000..69c9010
--- /dev/null
+++ b/quesoglc-0.7.2-glew-mx.patch
@@ -0,0 +1,48 @@
+diff -up quesoglc-0.7.2/configure~ quesoglc-0.7.2/configure
+--- quesoglc-0.7.2/configure~	2009-03-31 22:26:09.000000000 +0200
++++ quesoglc-0.7.2/configure	2012-07-28 13:30:37.739212475 +0200
+@@ -21170,13 +21170,13 @@ fi
+ 
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for glewContextInit in -lGLEW" >&5
+-echo $ECHO_N "checking for glewContextInit in -lGLEW... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for glewContextInit in -lGLEWmx" >&5
++echo $ECHO_N "checking for glewContextInit in -lGLEWmx... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_GLEW_glewContextInit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lGLEW  $LIBS"
++LIBS="-lGLEWmx  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21236,7 +21236,7 @@ if test $ac_cv_lib_GLEW_glewContextInit
+ #define HAVE_LIBGLEW 1
+ _ACEOF
+ 
+-  LIBS="-lGLEW $LIBS"
++  LIBS="-lGLEWmx $LIBS"
+ 
+ else
+   no_glew="yes"
+@@ -21282,7 +21282,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+-  LIBS="-lGLEW $LIBS"
++  LIBS="-lGLEWmx $LIBS"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -21306,7 +21306,8 @@ if (test "x$no_glew" = "xyes"); then
+   GLEW_CFLAGS="-DGLEW_MX"
+   GLEW_OBJ="libGLC_la-glew.lo"
+ else
+-  PKGCONFIG_LIBS_PRIVATE="-lGLEW $PKGCONFIG_LIBS_PRIVATE"
++  GLEW_CFLAGS="-DGLEW_MX"
++  PKGCONFIG_LIBS_PRIVATE="-lGLEWmx $PKGCONFIG_LIBS_PRIVATE"
+ fi
+ 
+ # Special flags for MinGW32 build.
diff --git a/quesoglc.spec b/quesoglc.spec
index 63d1172..4c19b2a 100644
--- a/quesoglc.spec
+++ b/quesoglc.spec
@@ -1,13 +1,14 @@
 Name:           quesoglc
 Version:        0.7.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The OpenGL Character Renderer
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://quesoglc.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-free.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         quesoglc-0.7.2-glew-mx.patch
+Patch1:         quesoglc-0.7.2-doxyfile.patch
 
 BuildRequires:  fontconfig-devel freeglut-devel
 BuildRequires:  fribidi-devel glew-devel libSM-devel libXmu-devel
@@ -30,12 +31,16 @@ interface (API).
 This package provides the libraries, include files, and other resources needed
 for developing GLC applications.
 
+
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 rm -f include/GL/{glxew,wglew,glew}.h
 ln -s %{_includedir}/GL/{glxew,wglew,glew}.h include/GL/
 rm -rf src/fribidi/
 
+
 %build
 %configure --disable-static 
 make %{?_smp_mflags}
@@ -43,29 +48,32 @@ cd docs
 doxygen
 cd ../
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/libGLC.la
+rm $RPM_BUILD_ROOT%{_libdir}/libGLC.la
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files
-%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README THANKS
 %{_libdir}/libGLC.so.*
-%doc AUTHORS ChangeLog COPYING README THANKS docs/html
 
 %files devel
-%defattr(-,root,root,-)
+%doc docs/html
 %{_includedir}/GL/glc.h
 %{_libdir}/libGLC.so
 %{_libdir}/pkgconfig/%{name}.pc
 
+
 %changelog
+* Sat Jul 28 2012 Hans de Goede <hdegoede at redhat.com> - 0.7.2-5
+- Fix FTBFS (rhbz#716030)
+- Fix multilib conflict (rhbz#831438)
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
