Author: kwizart Update of /cvs/nonfree/rpms/ufoai/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2527/F-17 Modified Files: ufoai.spec Added Files: ufoai-2.3.1-gcc47.patch ufoai-2.3.1-glib.patch ufoai-2.3.1-zpng.patch Removed Files: ufoai-ded.desktop ufoai.desktop Log Message: Fix FTBFS ufoai-2.3.1-gcc47.patch: Vector3.h | 1 + 1 file changed, 1 insertion(+) --- NEW FILE ufoai-2.3.1-gcc47.patch --- diff -up ufoai-2.3.1-source/src/tools/radiant/libs/math/Vector3.h.gcc47 ufoai-2.3.1-source/src/tools/radiant/libs/math/Vector3.h --- ufoai-2.3.1-source/src/tools/radiant/libs/math/Vector3.h.gcc47 2010-11-29 17:46:35.000000000 +0100 +++ ufoai-2.3.1-source/src/tools/radiant/libs/math/Vector3.h 2012-05-16 00:06:02.329926206 +0200 @@ -14,6 +14,7 @@ * execute an inner product of two vectors. */ +#include "FloatTools.h" #include "lrint.h" #include <sstream> #include <string> ufoai-2.3.1-glib.patch: libs/convert.h | 3 +-- libs/entity/miscparticle.cpp | 2 +- libs/gtkutil/IConv.h | 5 +---- libs/gtkutil/cursor.h | 2 +- libs/gtkutil/idledraw.h | 2 +- libs/os/dir.h | 2 +- libs/shaders/shaders.cpp | 2 +- radiant/vfs.cpp | 4 +--- 8 files changed, 8 insertions(+), 14 deletions(-) --- NEW FILE ufoai-2.3.1-glib.patch --- diff -up ufoai-2.3.1-source/src/tools/radiant/libs/convert.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/convert.h --- ufoai-2.3.1-source/src/tools/radiant/libs/convert.h.glib 2010-11-29 17:46:35.000000000 +0100 +++ ufoai-2.3.1-source/src/tools/radiant/libs/convert.h 2012-05-16 00:26:47.676522158 +0200 @@ -27,8 +27,7 @@ #include "debugging/debugging.h" #include <algorithm> -#include <glib/gunicode.h> -#include <glib/gconvert.h> +#include <glib.h> #include "character.h" diff -up ufoai-2.3.1-source/src/tools/radiant/libs/entity/miscparticle.cpp.glib ufoai-2.3.1-source/src/tools/radiant/libs/entity/miscparticle.cpp --- ufoai-2.3.1-source/src/tools/radiant/libs/entity/miscparticle.cpp.glib 2010-11-29 17:46:35.000000000 +0100 +++ ufoai-2.3.1-source/src/tools/radiant/libs/entity/miscparticle.cpp 2012-05-16 00:31:37.607581992 +0200 @@ -39,7 +39,7 @@ #include "math/line.h" #include "ifilesystem.h" -#include <glib/gslist.h> +#include <glib.h> #include "targetable.h" #include "origin.h" diff -up ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/cursor.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/cursor.h --- ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/cursor.h.glib 2010-11-29 17:46:35.000000000 +0100 +++ ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/cursor.h 2012-05-16 00:26:47.677522162 +0200 @@ -22,7 +22,7 @@ #if !defined(INCLUDED_GTKUTIL_CURSOR_H) #define INCLUDED_GTKUTIL_CURSOR_H -#include <glib/gmain.h> +#include <glib.h> #include <gdk/gdkevents.h> #include <gtk/gtkwidget.h> #include <gtk/gtkwindow.h> diff -up ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/IConv.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/IConv.h --- ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/IConv.h.glib 2010-11-29 17:46:35.000000000 +0100 +++ ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/IConv.h 2012-05-16 00:26:47.677522162 +0200 @@ -1,10 +1,7 @@ #ifndef _GTKUTIL_ICONV_H #define _GTKUTIL_ICONV_H -#include <glib/gconvert.h> -#include <glib/gmessages.h> -#include <glib/gunicode.h> -#include <glib/gmem.h> +#include <glib.h> #include <string> #include <cassert> diff -up ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/idledraw.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/idledraw.h --- ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/idledraw.h.glib 2010-11-29 17:46:35.000000000 +0100 +++ ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/idledraw.h 2012-05-16 00:26:47.678522166 +0200 @@ -22,7 +22,7 @@ #if !defined(INCLUDED_GTKUTIL_IDLEDRAW_H) #define INCLUDED_GTKUTIL_IDLEDRAW_H -#include <glib/gmain.h> +#include <glib.h> #include "generic/callback.h" diff -up ufoai-2.3.1-source/src/tools/radiant/libs/os/dir.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/os/dir.h --- ufoai-2.3.1-source/src/tools/radiant/libs/os/dir.h.glib 2010-11-29 17:46:35.000000000 +0100 +++ ufoai-2.3.1-source/src/tools/radiant/libs/os/dir.h 2012-05-16 00:26:47.678522166 +0200 @@ -27,7 +27,7 @@ #if !defined(INCLUDED_OS_DIR_H) #define INCLUDED_OS_DIR_H -#include <glib/gdir.h> +#include <glib.h> typedef GDir Directory; diff -up ufoai-2.3.1-source/src/tools/radiant/libs/shaders/shaders.cpp.glib ufoai-2.3.1-source/src/tools/radiant/libs/shaders/shaders.cpp --- ufoai-2.3.1-source/src/tools/radiant/libs/shaders/shaders.cpp.glib 2010-11-29 17:46:35.000000000 +0100 +++ ufoai-2.3.1-source/src/tools/radiant/libs/shaders/shaders.cpp 2012-05-16 00:31:11.319485974 +0200 @@ -51,7 +51,7 @@ #include "iradiant.h" #include "irender.h" -#include <glib/gslist.h> +#include <glib.h> #include "AutoPtr.h" #include "debugging/debugging.h" diff -up ufoai-2.3.1-source/src/tools/radiant/radiant/vfs.cpp.glib ufoai-2.3.1-source/src/tools/radiant/radiant/vfs.cpp --- ufoai-2.3.1-source/src/tools/radiant/radiant/vfs.cpp.glib 2010-11-29 17:46:35.000000000 +0100 +++ ufoai-2.3.1-source/src/tools/radiant/radiant/vfs.cpp 2012-05-16 00:26:47.679522170 +0200 @@ -45,9 +45,7 @@ #include <stdio.h> #include <stdlib.h> -#include <glib/gslist.h> -#include <glib/gdir.h> -#include <glib/gstrfuncs.h> +#include <glib.h> #include "AutoPtr.h" #include "iradiant.h" ufoai-2.3.1-zpng.patch: images.c | 4 ++++ 1 file changed, 4 insertions(+) --- NEW FILE ufoai-2.3.1-zpng.patch --- diff -up ufoai-2.3.1-source/src/shared/images.c.zpng ufoai-2.3.1-source/src/shared/images.c --- ufoai-2.3.1-source/src/shared/images.c.zpng 2010-11-29 17:46:35.000000000 +0100 +++ ufoai-2.3.1-source/src/shared/images.c 2012-05-15 23:57:55.255123139 +0200 @@ -33,6 +33,10 @@ #include <jpeglib.h> #include <png.h> +//#ifdef HAVE_ZLIB_H +#include <zlib.h> +//#endif + /** image formats, tried in this order */ static char *IMAGE_TYPES[] = { "tga", "png", "jpg", NULL }; Index: ufoai.spec =================================================================== RCS file: /cvs/nonfree/rpms/ufoai/F-17/ufoai.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ufoai.spec 7 Mar 2012 23:14:08 -0000 1.10 +++ ufoai.spec 15 May 2012 22:35:52 -0000 1.11 @@ -1,6 +1,6 @@ Name: ufoai Version: 2.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: UFO: Alien Invasion Group: Amusements/Games @@ -13,6 +13,9 @@ Patch1: ufoai-2.3-radiant-ldl.patch Patch2: ufoai-2.3-desktop-files.patch Patch3: ufoai-2.3.1-radiant-apppath.patch +Patch4: ufoai-2.3.1-zpng.patch +Patch5: ufoai-2.3.1-gcc47.patch +Patch6: ufoai-2.3.1-glib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -129,6 +132,9 @@ ## we do not like "arch-dependent-file" in /usr/share # change the target for the library sed -i -e "s/base/./" build/game.mk +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 -b .glib %build @@ -304,6 +310,9 @@ %changelog +* Tue May 15 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.3.1-5 +- Fix FTBFS + * Thu Mar 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.3.1-4 - Rebuilt for c++ ABI breakage --- ufoai-ded.desktop DELETED --- --- ufoai.desktop DELETED ---