rpms/cegui/devel .cvsignore, 1.4, 1.5 cegui-0.6.0-release-as-so-ver.patch, 1.1, 1.2 cegui.spec, 1.15, 1.16 sources, 1.4, 1.5 cegui-0.6.0-fixweaksymbol.patch, 1.1, NONE cegui-0.6.0-system-tinyxml.patch, 1.1, NONE cegui-0.6.0-system-tolua++.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Fri Jul 11 08:01:25 UTC 2008
Author: jwrdegoede
Update of /cvs/extras/rpms/cegui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7125
Modified Files:
.cvsignore cegui-0.6.0-release-as-so-ver.patch cegui.spec
sources
Removed Files:
cegui-0.6.0-fixweaksymbol.patch
cegui-0.6.0-system-tinyxml.patch
cegui-0.6.0-system-tolua++.patch
Log Message:
* Fri Jul 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.1-1
- New upstream release 0.6.1
- Drop upstreamed patches
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cegui/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 19 May 2008 12:02:20 -0000 1.4
+++ .cvsignore 11 Jul 2008 08:00:24 -0000 1.5
@@ -1,2 +1,2 @@
-CEGUI-0.6.0.tar.gz
-CEGUI-DOCS-0.6.0.tar.gz
+CEGUI-0.6.1.tar.gz
+CEGUI-0.6.1-DOCS.tar.gz
cegui-0.6.0-release-as-so-ver.patch:
Index: cegui-0.6.0-release-as-so-ver.patch
===================================================================
RCS file: /cvs/extras/rpms/cegui/devel/cegui-0.6.0-release-as-so-ver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cegui-0.6.0-release-as-so-ver.patch 19 May 2008 12:02:20 -0000 1.1
+++ cegui-0.6.0-release-as-so-ver.patch 11 Jul 2008 08:00:24 -0000 1.2
@@ -1,18 +1,18 @@
-diff -up CEGUI-0.6.0/ImageCodecModules/CoronaImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/CoronaImageCodec/Makefile.am
---- CEGUI-0.6.0/ImageCodecModules/CoronaImageCodec/Makefile.am~ 2008-05-18 22:18:51.000000000 +0200
-+++ CEGUI-0.6.0/ImageCodecModules/CoronaImageCodec/Makefile.am 2008-05-18 22:18:51.000000000 +0200
-@@ -7,6 +7,8 @@ if MINGW32_BUILD
+diff -up CEGUI-0.6.1/ImageCodecModules/CoronaImageCodec/Makefile.am.foo CEGUI-0.6.1/ImageCodecModules/CoronaImageCodec/Makefile.am
+--- CEGUI-0.6.1/ImageCodecModules/CoronaImageCodec/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.1/ImageCodecModules/CoronaImageCodec/Makefile.am 2008-07-11 08:30:44.000000000 +0200
+@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
+ if MINGW32_BUILD
libCEGUICoronaImageCodec_la_CPPFLAGS = -DCEGUICORONAIMAGECODEC_EXPORTS
libCEGUICoronaImageCodec_la_LDFLAGS = -no-undefined -avoid-version
- libCEGUICoronaImageCodec_la_LIBADD += -L$(top_builddir)/src -lCEGUIBase
+else
+libCEGUICoronaImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
- libCEGUICoronaImageCodec_la_LIBADD += $(Corona_LIBS)
-diff -up CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am
---- CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am~ 2008-05-18 22:19:17.000000000 +0200
-+++ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.am 2008-05-18 22:19:17.000000000 +0200
+ libCEGUICoronaImageCodec_la_LIBADD = $(Corona_LIBS) $(top_builddir)/src/libCEGUIBase.la
+diff -up CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.am.foo CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.am
+--- CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.am 2008-07-11 08:26:17.000000000 +0200
@@ -5,6 +5,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
if MINGW32_BUILD
libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS
@@ -21,10 +21,21 @@
+libCEGUIDevILImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
- libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) ../../src/libCEGUIBase.la
-diff -up CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am
---- CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am~ 2008-05-18 22:21:15.000000000 +0200
-+++ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.am 2008-05-18 22:21:15.000000000 +0200
+ libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) $(top_builddir)/src/libCEGUIBase.la
+diff -up CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.in.foo CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.in
+--- CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.in.foo 2008-06-29 16:09:09.000000000 +0200
++++ CEGUI-0.6.1/ImageCodecModules/DevILImageCodec/Makefile.in 2008-07-11 08:26:17.000000000 +0200
+@@ -239,6 +239,7 @@ INCLUDES = -I$(top_srcdir)/include $(Dev
+
+ @MINGW32_BUILD_TRUE at libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS
+ @MINGW32_BUILD_TRUE at libCEGUIDevILImageCodec_la_LDFLAGS = -no-undefined -avoid-version
++ at MINGW32_BUILD_FALSE@libCEGUIDevILImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
+
+ libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) $(top_builddir)/src/libCEGUIBase.la
+
+diff -up CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.am.foo CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.am
+--- CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.am 2008-07-11 08:26:17.000000000 +0200
@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
if MINGW32_BUILD
libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS
@@ -33,10 +44,21 @@
+libCEGUIFreeImageImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
- libCEGUIFreeImageImageCodec_la_LIBADD = $(FreeImage_LIBS) ../../src/libCEGUIBase.la
-diff -up CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am
---- CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am~ 2008-05-18 22:22:01.000000000 +0200
-+++ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.am 2008-05-18 22:22:01.000000000 +0200
+ libCEGUIFreeImageImageCodec_la_LIBADD = $(FreeImage_LIBS) $(top_builddir)/src/libCEGUIBase.la
+diff -up CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.in.foo CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.in
+--- CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.in.foo 2008-06-29 16:09:09.000000000 +0200
++++ CEGUI-0.6.1/ImageCodecModules/FreeImageImageCodec/Makefile.in 2008-07-11 08:26:17.000000000 +0200
+@@ -238,6 +238,7 @@ INCLUDES = -I$(top_srcdir)/include $(Fre
+
+ @MINGW32_BUILD_TRUE at libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS
+ @MINGW32_BUILD_TRUE at libCEGUIFreeImageImageCodec_la_LDFLAGS = -no-undefined -avoid-version
++ at MINGW32_BUILD_FALSE@libCEGUIFreeImageImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
+
+ libCEGUIFreeImageImageCodec_la_LIBADD = $(FreeImage_LIBS) $(top_builddir)/src/libCEGUIBase.la
+
+diff -up CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.am.foo CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.am
+--- CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.am 2008-07-11 08:26:17.000000000 +0200
@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
if MINGW32_BUILD
libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS
@@ -45,10 +67,21 @@
+libCEGUISILLYImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
- libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) ../../src/libCEGUIBase.la
-diff -up CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am~ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am
---- CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am~ 2008-05-18 22:22:43.000000000 +0200
-+++ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.am 2008-05-18 22:22:43.000000000 +0200
+ libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) $(top_builddir)/src/libCEGUIBase.la
+diff -up CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.in.foo CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.in
+--- CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.in.foo 2008-06-29 16:09:09.000000000 +0200
++++ CEGUI-0.6.1/ImageCodecModules/SILLYImageCodec/Makefile.in 2008-07-11 08:26:17.000000000 +0200
+@@ -238,6 +238,7 @@ INCLUDES = -I$(top_srcdir)/include $(SIL
+
+ @MINGW32_BUILD_TRUE at libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS
+ @MINGW32_BUILD_TRUE at libCEGUISILLYImageCodec_la_LDFLAGS = -no-undefined -avoid-version
++ at MINGW32_BUILD_FALSE@libCEGUISILLYImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
+
+ libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) $(top_builddir)/src/libCEGUIBase.la
+
+diff -up CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.am.foo CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.am
+--- CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.am 2008-07-11 08:26:17.000000000 +0200
@@ -4,6 +4,8 @@ pkgincludedir=$(prefix)/include/CEGUI/Im
if MINGW32_BUILD
libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS
@@ -58,22 +91,45 @@
endif
lib_LTLIBRARIES=libCEGUITGAImageCodec.la
-diff -up CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am~ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am
---- CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am~ 2008-05-18 22:26:10.000000000 +0200
-+++ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.am 2008-05-18 22:26:10.000000000 +0200
-@@ -11,7 +11,7 @@ endif
+diff -up CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.in.foo CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.in
+--- CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.in.foo 2008-06-29 16:09:09.000000000 +0200
++++ CEGUI-0.6.1/ImageCodecModules/TGAImageCodec/Makefile.in 2008-07-11 08:26:17.000000000 +0200
+@@ -238,6 +238,7 @@ INCLUDES = -I$(top_srcdir)/include
+
+ @MINGW32_BUILD_TRUE at libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS
+ @MINGW32_BUILD_TRUE at libCEGUITGAImageCodec_la_LDFLAGS = -no-undefined -avoid-version
++ at MINGW32_BUILD_FALSE@libCEGUITGAImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
- libCEGUIOpenGLRenderer_la_LIBADD = $(OpenGL_LIBS) ../../src/libCEGUIBase.la
+ lib_LTLIBRARIES = libCEGUITGAImageCodec.la
+ libCEGUITGAImageCodec_la_SOURCES = CEGUITGAImageCodec.cpp CEGUITGAImageCodecModule.cpp
+diff -up CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.am.foo CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.am
+--- CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.am.foo 2008-06-25 20:57:21.000000000 +0200
++++ CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.am 2008-07-11 08:26:17.000000000 +0200
+@@ -18,7 +18,7 @@ endif
+
+ libCEGUIOpenGLRenderer_la_LIBADD = $(OpenGL_LIBS) $(top_builddir)/src/libCEGUIBase.la
-libCEGUIOpenGLRenderer_la_LDFLAGS += -version-info @CEGUI_OPENGL_VERSION_INFO@
+libCEGUIOpenGLRenderer_la_LDFLAGS += -release @PACKAGE_VERSION@
lib_LTLIBRARIES=libCEGUIOpenGLRenderer.la
libCEGUIOpenGLRenderer_la_SOURCES = openglrenderer.cpp opengltexture.cpp
-diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am~ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
---- CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am~ 2008-05-18 22:25:50.000000000 +0200
-+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am 2008-05-18 22:25:50.000000000 +0200
-@@ -10,7 +10,7 @@ libCEGUILuaScriptModule_la_CPPFLAGS += -
+diff -up CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.in.foo CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.in
+--- CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.in.foo 2008-06-29 16:09:10.000000000 +0200
++++ CEGUI-0.6.1/RendererModules/OpenGLGUIRenderer/Makefile.in 2008-07-11 08:27:02.000000000 +0200
+@@ -242,7 +242,7 @@ xerces_LIBS = @xerces_LIBS@
+ INCLUDES = $(am__append_1) -I$(top_srcdir)/include -I$(top_srcdir) $(OpenGL_CFLAGS)
+ pkginclude_HEADERS = openglrenderer.h opengltexture.h
+
+-libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_2) -version-info @CEGUI_OPENGL_VERSION_INFO@
++libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_2) -release @PACKAGE_VERSION@
+
+ @MINGW32_BUILD_TRUE at libCEGUIOpenGLRenderer_la_CPPFLAGS = -DOPENGL_GUIRENDERER_EXPORTS
+
+diff -up CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am.foo CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
+--- CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am.foo 2008-05-26 20:56:07.000000000 +0200
++++ CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am 2008-07-11 08:26:17.000000000 +0200
+@@ -9,7 +9,7 @@ libCEGUILuaScriptModule_la_CPPFLAGS += -
libCEGUILuaScriptModule_la_LDFLAGS += -no-undefined -avoid-version
endif
@@ -82,9 +138,21 @@
lib_LTLIBRARIES = libCEGUILuaScriptModule.la
-diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.am~ CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.am
---- CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.am~ 2008-05-19 08:47:42.000000000 +0200
-+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.am 2008-05-19 08:47:42.000000000 +0200
+diff -up CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in.foo CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in
+--- CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in.foo 2008-06-29 16:09:12.000000000 +0200
++++ CEGUI-0.6.1/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in 2008-07-11 08:26:17.000000000 +0200
+@@ -244,7 +244,7 @@ INCLUDES = -I$(top_srcdir)/include \
+ -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include\
+ $(am__append_3) $(am__append_5)
+
+-libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -version-info @CEGUI_VERSION_INFO@
++libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -release @PACKAGE_VERSION@
+ libCEGUILuaScriptModule_la_CPPFLAGS = $(Lua_CFLAGS) $(am__append_1)
+
+ lib_LTLIBRARIES = libCEGUILuaScriptModule.la
+diff -up CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.am.foo CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.am
+--- CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.am.foo 2008-03-15 17:51:39.000000000 +0100
++++ CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.am 2008-07-11 08:26:17.000000000 +0200
@@ -7,7 +7,7 @@ libCEGUItoluapp_la_CPPFLAGS = -DTOLUA_EX
libCEGUItoluapp_la_LDFLAGS += -no-undefined
endif
@@ -94,9 +162,21 @@
lib_LTLIBRARIES = libCEGUItoluapp.la
-diff -up CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am~ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am
---- CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am~ 2008-05-18 22:25:17.000000000 +0200
-+++ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.am 2008-05-18 22:25:17.000000000 +0200
+diff -up CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.in.foo CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.in
+--- CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.in.foo 2008-06-29 16:09:12.000000000 +0200
++++ CEGUI-0.6.1/ScriptingModules/CEGUILua/tolua++/Makefile.in 2008-07-11 08:26:17.000000000 +0200
+@@ -237,7 +237,7 @@ xerces_CFLAGS = @xerces_CFLAGS@
+ xerces_LIBS = @xerces_LIBS@
+ INCLUDES = $(Lua_CFLAGS) -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++
+
+-libCEGUItoluapp_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@
++libCEGUItoluapp_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@
+
+ @MINGW32_BUILD_TRUE at libCEGUItoluapp_la_CPPFLAGS = -DTOLUA_EXPORTS
+
+diff -up CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.am.foo CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.am
+--- CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.am 2008-07-11 08:26:17.000000000 +0200
@@ -8,7 +8,7 @@ libCEGUIFalagardWRBase_la_CPPFLAGS = -DF
libCEGUIFalagardWRBase_la_LDFLAGS += -no-undefined -avoid-version
endif
@@ -104,11 +184,23 @@
-libCEGUIFalagardWRBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
+libCEGUIFalagardWRBase_la_LDFLAGS += -release @PACKAGE_VERSION@
- libCEGUIFalagardWRBase_la_LIBADD = ../../../src/libCEGUIBase.la
+ libCEGUIFalagardWRBase_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la
+
+diff -up CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.in.foo CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.in
+--- CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.in.foo 2008-06-29 16:09:13.000000000 +0200
++++ CEGUI-0.6.1/WindowRendererSets/Falagard/src/Makefile.in 2008-07-11 08:26:17.000000000 +0200
+@@ -239,7 +239,7 @@ INCLUDES = -I$(top_srcdir)/include \
+ -I$(top_srcdir)/WindowRendererSets/Falagard/include
-diff -up CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am~ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am
---- CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am~ 2008-05-18 22:23:24.000000000 +0200
-+++ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.am 2008-05-18 22:23:24.000000000 +0200
+
+-libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@
++libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@
+
+ @MINGW32_BUILD_TRUE at libCEGUIFalagardWRBase_la_CPPFLAGS = -DFALAGARDWRBASE_EXPORTS -DCEGUIWRMODULE_EXPORTS
+
+diff -up CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.am.foo CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.am
+--- CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.am.foo 2008-05-26 20:56:07.000000000 +0200
++++ CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.am 2008-07-11 08:26:17.000000000 +0200
@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include
if MINGW32_BUILD
libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS
@@ -118,9 +210,20 @@
endif
lib_LTLIBRARIES=libCEGUITinyXMLParser.la
-diff -up CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am~ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am
---- CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am~ 2008-05-18 22:23:57.000000000 +0200
-+++ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.am 2008-05-18 22:23:57.000000000 +0200
+diff -up CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.in.foo CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.in
+--- CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.in.foo 2008-06-29 16:09:13.000000000 +0200
++++ CEGUI-0.6.1/XMLParserModules/TinyXMLParser/Makefile.in 2008-07-11 08:26:17.000000000 +0200
+@@ -246,6 +246,7 @@ INCLUDES = -I$(top_srcdir)/include $(am_
+
+ @MINGW32_BUILD_TRUE at libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS
+ @MINGW32_BUILD_TRUE at libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version
++ at MINGW32_BUILD_FALSE@libCEGUITinyXMLParser_la_LDFLAGS = -release @PACKAGE_VERSION@
+
+ lib_LTLIBRARIES = libCEGUITinyXMLParser.la
+ libCEGUITinyXMLParser_la_LIBADD = $(top_builddir)/src/libCEGUIBase.la $(am__append_3)
+diff -up CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.am.foo CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.am
+--- CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.am 2008-07-11 08:26:17.000000000 +0200
@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(xer
if MINGW32_BUILD
libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS
@@ -129,10 +232,21 @@
+libCEGUIXercesParser_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
- libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) ../../src/libCEGUIBase.la
-diff -up CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am~ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am
---- CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am~ 2008-05-18 22:24:22.000000000 +0200
-+++ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.am 2008-05-18 22:24:22.000000000 +0200
+ libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) $(top_builddir)/src/libCEGUIBase.la
+diff -up CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.in.foo CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.in
+--- CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.in.foo 2008-06-29 16:09:13.000000000 +0200
++++ CEGUI-0.6.1/XMLParserModules/XercesParser/Makefile.in 2008-07-11 08:26:17.000000000 +0200
+@@ -238,6 +238,7 @@ INCLUDES = -I$(top_srcdir)/include $(xer
+
+ @MINGW32_BUILD_TRUE at libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS
+ @MINGW32_BUILD_TRUE at libCEGUIXercesParser_la_LDFLAGS = -no-undefined -avoid-version
++ at MINGW32_BUILD_FALSE@libCEGUIXercesParser_la_LDFLAGS = -release @PACKAGE_VERSION@
+
+ libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) $(top_builddir)/src/libCEGUIBase.la
+
+diff -up CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.am.foo CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.am
+--- CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.am 2008-07-11 08:26:17.000000000 +0200
@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(exp
if MINGW32_BUILD
libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS
@@ -141,10 +255,21 @@
+libCEGUIExpatParser_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
- libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) ../../src/libCEGUIBase.la
-diff -up CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am~ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am
---- CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am~ 2008-05-18 22:24:58.000000000 +0200
-+++ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.am 2008-05-18 22:24:58.000000000 +0200
+ libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) $(top_builddir)/src/libCEGUIBase.la
+diff -up CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.in.foo CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.in
+--- CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.in.foo 2008-06-29 16:09:13.000000000 +0200
++++ CEGUI-0.6.1/XMLParserModules/expatParser/Makefile.in 2008-07-11 08:26:17.000000000 +0200
+@@ -238,6 +238,7 @@ INCLUDES = -I$(top_srcdir)/include $(exp
+
+ @MINGW32_BUILD_TRUE at libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS
+ @MINGW32_BUILD_TRUE at libCEGUIExpatParser_la_LDFLAGS = -no-undefined -avoid-version
++ at MINGW32_BUILD_FALSE@libCEGUIExpatParser_la_LDFLAGS = -release @PACKAGE_VERSION@
+
+ libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) $(top_builddir)/src/libCEGUIBase.la
+
+diff -up CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.am.foo CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.am
+--- CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.am.foo 2008-05-25 10:25:55.000000000 +0200
++++ CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.am 2008-07-11 08:26:17.000000000 +0200
@@ -3,6 +3,8 @@ INCLUDES = -I$(top_srcdir)/include $(lib
if MINGW32_BUILD
libCEGUILibxmlParser_la_CPPFLAGS = -DCEGUILIBXMLPARSER_EXPORTS
@@ -153,164 +278,39 @@
+libCEGUILibxmlParser_la_LDFLAGS = -release @PACKAGE_VERSION@
endif
- libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) ../../src/libCEGUIBase.la
-diff -up CEGUI-0.6.0/src/Makefile.am~ CEGUI-0.6.0/src/Makefile.am
---- CEGUI-0.6.0/src/Makefile.am~ 2008-05-18 22:26:54.000000000 +0200
-+++ CEGUI-0.6.0/src/Makefile.am 2008-05-18 22:26:54.000000000 +0200
-@@ -7,7 +7,7 @@ libCEGUIBase_la_CPPFLAGS = -DCEGUIBASE_E
- libCEGUIBase_la_LDFLAGS += -shared -no-undefined
- endif
-
--libCEGUIBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
-+libCEGUIBase_la_LDFLAGS += -release @PACKAGE_VERSION@
- libCEGUIBase_la_LIBADD = $(freetype2_LIBS) $(pcre_LIBS)
-
- lib_LTLIBRARIES=libCEGUIBase.la
-diff -up CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in~ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in
---- CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in~ 2008-05-18 22:20:08.000000000 +0200
-+++ CEGUI-0.6.0/ImageCodecModules/DevILImageCodec/Makefile.in 2008-05-18 22:20:08.000000000 +0200
-@@ -229,6 +229,7 @@ libCEGUIDevILImageCodec_la_LIBADD = $(am
-
- @MINGW32_BUILD_TRUE at libCEGUIDevILImageCodec_la_CPPFLAGS = -DCEGUIDEVILIMAGECODEC_EXPORTS
- @MINGW32_BUILD_TRUE at libCEGUIDevILImageCodec_la_LDFLAGS = -no-undefined -avoid-version
-+ at MINGW32_BUILD_FALSE@libCEGUIDevILImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
-
- lib_LTLIBRARIES = libCEGUIDevILImageCodec.la
-
-diff -up CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in~ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in
---- CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in~ 2008-05-18 22:21:13.000000000 +0200
-+++ CEGUI-0.6.0/ImageCodecModules/FreeImageImageCodec/Makefile.in 2008-05-18 22:21:13.000000000 +0200
-@@ -228,6 +228,7 @@ libCEGUIFreeImageImageCodec_la_LIBADD =
-
- @MINGW32_BUILD_TRUE at libCEGUIFreeImageImageCodec_la_CPPFLAGS = -DCEGUIFREEIMAGEIMAGECODEC_EXPORTS
- @MINGW32_BUILD_TRUE at libCEGUIFreeImageImageCodec_la_LDFLAGS = -no-undefined -avoid-version
-+ at MINGW32_BUILD_FALSE@libCEGUIFreeImageImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
-
- lib_LTLIBRARIES = libCEGUIFreeImageImageCodec.la
-
-diff -up CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in~ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in
---- CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in~ 2008-05-18 22:21:59.000000000 +0200
-+++ CEGUI-0.6.0/ImageCodecModules/SILLYImageCodec/Makefile.in 2008-05-18 22:21:59.000000000 +0200
-@@ -228,6 +228,7 @@ libCEGUISILLYImageCodec_la_LIBADD = $(am
-
- @MINGW32_BUILD_TRUE at libCEGUISILLYImageCodec_la_CPPFLAGS = -DCEGUISILLYIMAGECODEC_EXPORTS
- @MINGW32_BUILD_TRUE at libCEGUISILLYImageCodec_la_LDFLAGS = -no-undefined -avoid-version
-+ at MINGW32_BUILD_FALSE@libCEGUISILLYImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
-
- lib_LTLIBRARIES = libCEGUISILLYImageCodec.la
-
-diff -up CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in~ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in
---- CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in~ 2008-05-18 22:22:40.000000000 +0200
-+++ CEGUI-0.6.0/ImageCodecModules/TGAImageCodec/Makefile.in 2008-05-18 22:22:40.000000000 +0200
-@@ -225,6 +225,7 @@ INCLUDES = -I$(top_srcdir)/include
-
- @MINGW32_BUILD_TRUE at libCEGUITGAImageCodec_la_CPPFLAGS = -DCEGUITGAIMAGECODEC_EXPORTS
- @MINGW32_BUILD_TRUE at libCEGUITGAImageCodec_la_LDFLAGS = -no-undefined -avoid-version
-+ at MINGW32_BUILD_FALSE@libCEGUITGAImageCodec_la_LDFLAGS = -release @PACKAGE_VERSION@
-
- libCEGUITGAImageCodec_la_LIBADD = ../../src/libCEGUIBase.la
-
-diff -up CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in~ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in
---- CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in~ 2008-05-18 22:26:17.000000000 +0200
-+++ CEGUI-0.6.0/RendererModules/OpenGLGUIRenderer/Makefile.in 2008-05-18 22:26:17.000000000 +0200
-@@ -226,7 +226,7 @@ xerces_LIBS = @xerces_LIBS@
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir) $(OpenGL_CFLAGS)
- pkginclude_HEADERS = openglrenderer.h opengltexture.h
-
--libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_OPENGL_VERSION_INFO@
-+libCEGUIOpenGLRenderer_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@
-
- libCEGUIOpenGLRenderer_la_LIBADD = $(am__append_2) $(OpenGL_LIBS) ../../src/libCEGUIBase.la
-
-diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in~ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in
---- CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in~ 2008-05-18 22:25:59.000000000 +0200
-+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.in 2008-05-18 22:25:59.000000000 +0200
-@@ -228,7 +228,7 @@ INCLUDES = -I$(top_srcdir)/include \
- -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include
-
-
--libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -version-info @CEGUI_VERSION_INFO@
-+libCEGUILuaScriptModule_la_LDFLAGS = $(am__append_2) -release @PACKAGE_VERSION@
- libCEGUILuaScriptModule_la_CPPFLAGS = $(Lua_CFLAGS) $(am__append_1)
- libCEGUILuaScriptModule_la_LIBADD = ../../../../src/libCEGUIBase.la ../../tolua++/libCEGUItoluapp.la
-
-diff -up CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.in~ CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.in
---- CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.in~ 2008-05-19 08:47:52.000000000 +0200
-+++ CEGUI-0.6.0/ScriptingModules/CEGUILua/tolua++/Makefile.in 2008-05-19 08:47:52.000000000 +0200
-@@ -224,7 +224,7 @@ xerces_CFLAGS = @xerces_CFLAGS@
- xerces_LIBS = @xerces_LIBS@
- INCLUDES = $(Lua_CFLAGS) -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++
-
--libCEGUItoluapp_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@
-+libCEGUItoluapp_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@
-
- @MINGW32_BUILD_TRUE at libCEGUItoluapp_la_CPPFLAGS = -DTOLUA_EXPORTS
-
-diff -up CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in~ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in
---- CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in~ 2008-05-18 22:25:39.000000000 +0200
-+++ CEGUI-0.6.0/WindowRendererSets/Falagard/src/Makefile.in 2008-05-18 22:25:39.000000000 +0200
-@@ -226,7 +226,7 @@ INCLUDES = -I$(top_srcdir)/include \
- -I$(top_srcdir)/WindowRendererSets/Falagard/include
-
-
--libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@
-+libCEGUIFalagardWRBase_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@
-
- @MINGW32_BUILD_TRUE at libCEGUIFalagardWRBase_la_CPPFLAGS = -DFALAGARDWRBASE_EXPORTS -DCEGUIWRMODULE_EXPORTS
-
-diff -up CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in~ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in
---- CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in~ 2008-05-18 22:23:23.000000000 +0200
-+++ CEGUI-0.6.0/XMLParserModules/TinyXMLParser/Makefile.in 2008-05-18 22:23:23.000000000 +0200
-@@ -226,6 +226,7 @@ INCLUDES = -I$(top_srcdir)/include
-
- @MINGW32_BUILD_TRUE at libCEGUITinyXMLParser_la_CPPFLAGS = -DCEGUITINYXMLPARSER_EXPORTS
- @MINGW32_BUILD_TRUE at libCEGUITinyXMLParser_la_LDFLAGS = -no-undefined -avoid-version
-+ at MINGW32_BUILD_FALSE@libCEGUITinyXMLParser_la_LDFLAGS = -release @PACKAGE_VERSION@
-
- libCEGUITinyXMLParser_la_LIBADD = ../../src/libCEGUIBase.la
-
-diff -up CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in~ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in
---- CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in~ 2008-05-18 22:23:55.000000000 +0200
-+++ CEGUI-0.6.0/XMLParserModules/XercesParser/Makefile.in 2008-05-18 22:23:55.000000000 +0200
-@@ -228,6 +228,7 @@ libCEGUIXercesParser_la_LIBADD = $(am__a
-
- @MINGW32_BUILD_TRUE at libCEGUIXercesParser_la_CPPFLAGS = -DCEGUIXERCESPARSER_EXPORTS
- @MINGW32_BUILD_TRUE at libCEGUIXercesParser_la_LDFLAGS = -no-undefined -avoid-version
-+ at MINGW32_BUILD_FALSE@libCEGUIXercesParser_la_LDFLAGS = -release @PACKAGE_VERSION@
-
- lib_LTLIBRARIES = libCEGUIXercesParser.la
-
-diff -up CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in~ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in
---- CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in~ 2008-05-18 22:24:21.000000000 +0200
-+++ CEGUI-0.6.0/XMLParserModules/expatParser/Makefile.in 2008-05-18 22:24:21.000000000 +0200
-@@ -228,6 +228,7 @@ libCEGUIExpatParser_la_LIBADD = $(am__ap
-
- @MINGW32_BUILD_TRUE at libCEGUIExpatParser_la_CPPFLAGS = -DCEGUIEXPATPARSER_EXPORTS
- @MINGW32_BUILD_TRUE at libCEGUIExpatParser_la_LDFLAGS = -no-undefined -avoid-version
-+ at MINGW32_BUILD_FALSE@libCEGUIExpatParser_la_LDFLAGS = -release @PACKAGE_VERSION@
-
- lib_LTLIBRARIES = libCEGUIExpatParser.la
-
-diff -up CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in~ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in
---- CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in~ 2008-05-18 22:24:56.000000000 +0200
-+++ CEGUI-0.6.0/XMLParserModules/libxmlParser/Makefile.in 2008-05-18 22:24:56.000000000 +0200
-@@ -229,6 +229,7 @@ libCEGUILibxmlParser_la_LIBADD = $(am__a
+ libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) $(top_builddir)/src/libCEGUIBase.la
+diff -up CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.in.foo CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.in
+--- CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.in.foo 2008-06-29 16:09:13.000000000 +0200
++++ CEGUI-0.6.1/XMLParserModules/libxmlParser/Makefile.in 2008-07-11 08:26:17.000000000 +0200
+@@ -239,6 +239,7 @@ INCLUDES = -I$(top_srcdir)/include $(lib
@MINGW32_BUILD_TRUE at libCEGUILibxmlParser_la_CPPFLAGS = -DCEGUILIBXMLPARSER_EXPORTS
@MINGW32_BUILD_TRUE at libCEGUILibxmlParser_la_LDFLAGS = -no-undefined -avoid-version
+ at MINGW32_BUILD_FALSE@libCEGUILibxmlParser_la_LDFLAGS = -release @PACKAGE_VERSION@
- lib_LTLIBRARIES = libCEGUILibxmlParser.la
+ libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) $(top_builddir)/src/libCEGUIBase.la
+
+diff -up CEGUI-0.6.1/src/Makefile.am.foo CEGUI-0.6.1/src/Makefile.am
+--- CEGUI-0.6.1/src/Makefile.am.foo 2008-06-24 21:01:53.000000000 +0200
++++ CEGUI-0.6.1/src/Makefile.am 2008-07-11 08:28:46.000000000 +0200
+@@ -9,7 +9,7 @@ libCEGUIBase_la_LDFLAGS += -shared -no-u
+ libCEGUIBase_la_LIBADD += -lwinmm
+ endif
-diff -up CEGUI-0.6.0/src/Makefile.in~ CEGUI-0.6.0/src/Makefile.in
---- CEGUI-0.6.0/src/Makefile.in~ 2008-05-18 22:27:02.000000000 +0200
-+++ CEGUI-0.6.0/src/Makefile.in 2008-05-18 22:27:02.000000000 +0200
-@@ -224,7 +224,7 @@ xerces_CFLAGS = @xerces_CFLAGS@
+-libCEGUIBase_la_LDFLAGS += -version-info @CEGUI_VERSION_INFO@
++libCEGUIBase_la_LDFLAGS += -release @PACKAGE_VERSION@
+ libCEGUIBase_la_LIBADD += $(freetype2_LIBS) $(pcre_LIBS)
+
+ lib_LTLIBRARIES=libCEGUIBase.la
+diff -up CEGUI-0.6.1/src/Makefile.in.foo CEGUI-0.6.1/src/Makefile.in
+--- CEGUI-0.6.1/src/Makefile.in.foo 2008-06-29 16:09:14.000000000 +0200
++++ CEGUI-0.6.1/src/Makefile.in 2008-07-11 08:29:26.000000000 +0200
+@@ -240,7 +240,7 @@ xerces_CFLAGS = @xerces_CFLAGS@
xerces_LIBS = @xerces_LIBS@
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir) $(freetype2_CFLAGS) $(pcre_CFLAGS)
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir) $(freetype2_CFLAGS) $(pcre_CFLAGS) $(am__append_3)
-libCEGUIBase_la_LDFLAGS = $(am__append_1) -version-info @CEGUI_VERSION_INFO@
+libCEGUIBase_la_LDFLAGS = $(am__append_1) -release @PACKAGE_VERSION@
+ libCEGUIBase_la_LIBADD = $(am__append_2) $(freetype2_LIBS) $(pcre_LIBS)
@MINGW32_BUILD_TRUE at libCEGUIBase_la_CPPFLAGS = -DCEGUIBASE_EXPORTS
- libCEGUIBase_la_LIBADD = $(freetype2_LIBS) $(pcre_LIBS)
Index: cegui.spec
===================================================================
RCS file: /cvs/extras/rpms/cegui/devel/cegui.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cegui.spec 24 May 2008 18:05:38 -0000 1.15
+++ cegui.spec 11 Jul 2008 08:00:24 -0000 1.16
@@ -1,20 +1,19 @@
Name: cegui
-Version: 0.6.0
+Version: 0.6.1
Release: 1%{?dist}
Summary: Free library providing windowing and widgets for graphics APIs / engines
Group: System Environment/Libraries
License: MIT
URL: http://www.cegui.org.uk
-Source0: http://downloads.sourceforge.net/crayzedsgui/CEGUI-%{version}.tar.gz
-Source1: http://downloads.sourceforge.net/crayzedsgui/CEGUI-DOCS-%{version}.tar.gz
-# Submitted upstream: http://www.cegui.org.uk/mantis/view.php?id=196
-Patch0: cegui-0.6.0-fixweaksymbol.patch
+# This is
+# http://downloads.sourceforge.net/crayzedsgui/CEGUI-%{version}.tar.gz
+# with the bundled GLEW removed as its an older GLEW version which contains
+# parts under then non Free SGI OpenGL and GLX licenses
+Source0: CEGUI-%{version}.tar.gz
+Source1: http://downloads.sourceforge.net/crayzedsgui/CEGUI-%{version}-DOCS.tar.gz
# Both submitted upstream: http://www.cegui.org.uk/mantis/view.php?id=197
Patch1: cegui-0.6.0-release-as-so-ver.patch
Patch2: cegui-0.6.0-userverso.patch
-# Both submitted upstream: http://www.cegui.org.uk/mantis/view.php?id=198
-Patch3: cegui-0.6.0-system-tolua++.patch
-Patch4: cegui-0.6.0-system-tinyxml.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: DevIL-devel
BuildRequires: expat-devel
@@ -61,11 +60,8 @@
%prep
%setup -qb1 -qn CEGUI-%{version}
-%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
# Permission fixes for debuginfo RPM
chmod -x include/falagard/*.h
@@ -78,6 +74,14 @@
iconv -f iso8859-1 TODO -t utf8 > TODO.conv && mv -f TODO.conv TODO
iconv -f iso8859-1 README -t utf8 > README.conv && mv -f README.conv README
+# Make makefile happy even though we've removed the (unused) included copy of
+# GLEW due to license reasons
+mkdir -p RendererModules/OpenGLGUIRenderer/GLEW/GL
+touch RendererModules/OpenGLGUIRenderer/GLEW/GL/glew.h
+touch RendererModules/OpenGLGUIRenderer/GLEW/GL/glxew.h
+touch RendererModules/OpenGLGUIRenderer/GLEW/GL/wglew.h
+touch RendererModules/OpenGLGUIRenderer/GLEW/GLEW-LICENSE
+
%build
%configure --disable-static --disable-corona --enable-devil \
@@ -123,10 +127,15 @@
%files devel-doc
+%defattr(-,root,root,-)
%doc documentation/FalagardSkinning.pdf documentation/api_reference
%changelog
+* Fri Jul 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.1-1
+- New upstream release 0.6.1
+- Drop upstreamed patches
+
* Sun May 18 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.0-1
- New upstream release 0.6.0
- No ABI stability, use full versioned (libtool -release) sonames
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cegui/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 19 May 2008 12:02:20 -0000 1.4
+++ sources 11 Jul 2008 08:00:24 -0000 1.5
@@ -1,2 +1,2 @@
-a7772b20a4e3530298e3e28c4eaec1bb CEGUI-0.6.0.tar.gz
-8abece86ea0b8a52737579ac2e801978 CEGUI-DOCS-0.6.0.tar.gz
+130fcdfb7a6a4b9cc72df196040e231b CEGUI-0.6.1.tar.gz
+e0fe06bb43e00c5d7b278e7167740bd7 CEGUI-0.6.1-DOCS.tar.gz
--- cegui-0.6.0-fixweaksymbol.patch DELETED ---
--- cegui-0.6.0-system-tinyxml.patch DELETED ---
--- cegui-0.6.0-system-tolua++.patch DELETED ---
More information about the fedora-extras-commits
mailing list