rpms/libprojectM/devel libprojectM-ftgl.patch, NONE, 1.1 libprojectM.spec, 1.6, 1.7

Caolan McNamara caolanm at fedoraproject.org
Wed Jul 29 10:32:09 UTC 2009


Author: caolanm

Update of /cvs/pkgs/rpms/libprojectM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16900

Modified Files:
	libprojectM.spec 
Added Files:
	libprojectM-ftgl.patch 
Log Message:
Resolves: rhbz#511587 FTBFS libprojectM

libprojectM-ftgl.patch:
 Renderer.hpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libprojectM-ftgl.patch ---
--- libprojectM-1.2.0/Renderer.hpp.orig	2009-07-20 12:29:00.000000000 +0100
+++ libprojectM-1.2.0/Renderer.hpp	2009-07-20 12:29:03.000000000 +0100
@@ -24,7 +24,7 @@
 #include <FTGLPixmapFont.h>
 #include <FTGLExtrdFont.h>
 #else
-#include <FTGL/FTGL.h>
+#include <FTGL/ftgl.h>
 #include <FTGL/FTGLPixmapFont.h>
 #include <FTGL/FTGLExtrdFont.h>
 #endif


Index: libprojectM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/devel/libprojectM.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libprojectM.spec	25 Jul 2009 08:29:16 -0000	1.6
+++ libprojectM.spec	29 Jul 2009 10:32:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		libprojectM
 Version:	1.2.0
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	The libraries for the projectM music visualization plugin
 Group:		Applications/Multimedia
 License:	LGPLv2+
@@ -14,6 +14,9 @@ Patch1:		libprojectM-pc-libsuffix.patch
 
 #Add include stdio.h in BuiltinParams.cpp to fix compile error
 Patch2:		libprojectM-stdio.patch
+
+# FTGL.h -> ftgl.h to compile
+Patch3:		libprojectM-ftgl.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ftgl-devel, cmake, glew-devel
 Requires:	dejavu-sans-mono-fonts, dejavu-sans-fonts
@@ -39,6 +42,7 @@ developing applications that use %{name}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 sed -i 's/\r//' ChangeLog
 
 %build
@@ -75,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jul 29 2009 Caolán McNamara <caolanm at redhat.com> - 1.2.0-11
+- Resolves: rhbz#511587 FTBFS libprojectM
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list