rpms/cegui/FC-6 cegui-0.5.0-fixweaksymbol.patch, NONE, 1.1 cegui-0.5.0-lua51.patch, NONE, 1.1 cegui-0.5.0-userverso.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 cegui.spec, 1.4, 1.5 sources, 1.2, 1.3 cegui_mk2-0.4.1-64bit.patch, 1.1, NONE cegui_mk2-0.4.1-fixheader.patch, 1.1, NONE cegui_mk2-0.4.1-fixtinyxml.patch, 1.1, NONE cegui_mk2-0.4.1-pcre.patch, 1.1, NONE cegui_mk2-0.4.1-tolua++.patch, 1.1, NONE cegui_mk2-0.4.1-useverso.patch, 1.1, NONE

Ian Chapman (oddsocks) fedora-extras-commits at redhat.com
Wed Jul 4 18:27:54 UTC 2007


Author: oddsocks

Update of /cvs/extras/rpms/cegui/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14547

Modified Files:
	.cvsignore cegui.spec sources 
Added Files:
	cegui-0.5.0-fixweaksymbol.patch cegui-0.5.0-lua51.patch 
	cegui-0.5.0-userverso.patch 
Removed Files:
	cegui_mk2-0.4.1-64bit.patch cegui_mk2-0.4.1-fixheader.patch 
	cegui_mk2-0.4.1-fixtinyxml.patch cegui_mk2-0.4.1-pcre.patch 
	cegui_mk2-0.4.1-tolua++.patch cegui_mk2-0.4.1-useverso.patch 
Log Message:


cegui-0.5.0-fixweaksymbol.patch:

--- NEW FILE cegui-0.5.0-fixweaksymbol.patch ---
diff -uNr -x '*.log' CEGUI-0.5.0/ImageCodecModules/DevILImageCodec/Makefile.am CEGUI-0.5.0.work/ImageCodecModules/DevILImageCodec/Makefile.am
--- CEGUI-0.5.0/ImageCodecModules/DevILImageCodec/Makefile.am	2006-07-28 02:24:36.000000000 +0100
+++ CEGUI-0.5.0.work/ImageCodecModules/DevILImageCodec/Makefile.am	2007-06-10 18:08:28.000000000 +0100
@@ -4,6 +4,6 @@
 
 lib_LTLIBRARIES=libCEGUIDevILImageCodec.la
 libCEGUIDevILImageCodec_la_SOURCES = CEGUIDevILImageCodec.cpp CEGUIDevILImageCodecModule.cpp
-libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) 
+libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) ../../src/libCEGUIBase.la
 pkginclude_HEADERS = CEGUIDevILImageCodec.h CEGUIDevILImageCodecModule.h
 
diff -uNr -x '*.log' CEGUI-0.5.0/ImageCodecModules/SILLYImageCodec/Makefile.am CEGUI-0.5.0.work/ImageCodecModules/SILLYImageCodec/Makefile.am
--- CEGUI-0.5.0/ImageCodecModules/SILLYImageCodec/Makefile.am	2006-07-28 02:24:36.000000000 +0100
+++ CEGUI-0.5.0.work/ImageCodecModules/SILLYImageCodec/Makefile.am	2007-06-10 18:10:54.000000000 +0100
@@ -3,6 +3,6 @@
 
 lib_LTLIBRARIES=libCEGUISILLYImageCodec.la
 libCEGUISILLYImageCodec_la_SOURCES = CEGUISILLYImageCodec.cpp CEGUISILLYImageCodecModule.cpp 
-libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS)
+libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) ../../src/libCEGUIBase.la
 pkginclude_HEADERS = CEGUISILLYImageCodec.h CEGUISILLYImageCodecModule.h
 
diff -uNr -x '*.log' CEGUI-0.5.0/ImageCodecModules/TGAImageCodec/Makefile.am CEGUI-0.5.0.work/ImageCodecModules/TGAImageCodec/Makefile.am
--- CEGUI-0.5.0/ImageCodecModules/TGAImageCodec/Makefile.am	2006-07-28 02:24:36.000000000 +0100
+++ CEGUI-0.5.0.work/ImageCodecModules/TGAImageCodec/Makefile.am	2007-06-10 23:38:40.000000000 +0100
@@ -3,6 +3,7 @@
 
 lib_LTLIBRARIES=libCEGUITGAImageCodec.la
 libCEGUITGAImageCodec_la_SOURCES = CEGUITGAImageCodec.cpp CEGUITGAImageCodecModule.cpp
+libCEGUITGAImageCodec_la_LIBADD = ../../src/libCEGUIBase.la
 pkginclude_HEADERS = CEGUITGAImageCodec.h CEGUITGAImageCodecModule.h 
 
 
diff -uNr -x '*.log' CEGUI-0.5.0/RendererModules/OpenGLGUIRenderer/Makefile.am CEGUI-0.5.0.work/RendererModules/OpenGLGUIRenderer/Makefile.am
--- CEGUI-0.5.0/RendererModules/OpenGLGUIRenderer/Makefile.am	2006-07-28 02:24:36.000000000 +0100
+++ CEGUI-0.5.0.work/RendererModules/OpenGLGUIRenderer/Makefile.am	2007-06-10 22:11:29.000000000 +0100
@@ -2,6 +2,7 @@
 pkgincludedir=$(prefix)/include/CEGUI/RendererModules/OpenGLGUIRenderer
 pkginclude_HEADERS = openglrenderer.h opengltexture.h
 lib_LTLIBRARIES=libCEGUIOpenGLRenderer.la
+libCEGUIOpenGLRenderer_la_LIBADD = ../../src/libCEGUIBase.la -lGL -lGLU
 libCEGUIOpenGLRenderer_la_LDFLAGS = -version-info @CEGUI_OPENGL_VERSION_INFO@
 libCEGUIOpenGLRenderer_la_SOURCES = openglrenderer.cpp opengltexture.cpp
 
diff -uNr -x '*.log' CEGUI-0.5.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am CEGUI-0.5.0.work/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
--- CEGUI-0.5.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2006-07-25 09:34:51.000000000 +0100
+++ CEGUI-0.5.0.work/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2007-06-10 18:50:20.000000000 +0100
@@ -9,5 +9,6 @@
                                      CEGUILua.cpp \
                                      CEGUILuaFunctor.cpp \
                                      required.cpp
+libCEGUILuaScriptModule_la_LIBADD = ../../../../src/libCEGUIBase.la ../../tolua++/libCEGUItoluapp.la
 
 noinst_HEADERS = required.h
diff -uNr -x '*.log' CEGUI-0.5.0/WindowRendererSets/Falagard/src/Makefile.am CEGUI-0.5.0.work/WindowRendererSets/Falagard/src/Makefile.am
--- CEGUI-0.5.0/WindowRendererSets/Falagard/src/Makefile.am	2006-05-09 20:58:32.000000000 +0100
+++ CEGUI-0.5.0.work/WindowRendererSets/Falagard/src/Makefile.am	2007-06-10 18:16:42.000000000 +0100
@@ -41,3 +41,5 @@
                                   FalTabControlProperties.cpp \
                                   FalTitlebar.cpp \
                                   FalTooltip.cpp
+
+libCEGUIFalagardWRBase_la_LIBADD = ../../../src/libCEGUIBase.la
diff -uNr -x '*.log' CEGUI-0.5.0/XMLParserModules/expatParser/Makefile.am CEGUI-0.5.0.work/XMLParserModules/expatParser/Makefile.am
--- CEGUI-0.5.0/XMLParserModules/expatParser/Makefile.am	2006-03-07 12:57:10.000000000 +0000
+++ CEGUI-0.5.0.work/XMLParserModules/expatParser/Makefile.am	2007-06-10 18:11:25.000000000 +0100
@@ -6,4 +6,4 @@
 pkgincludedir=$(prefix)/include/CEGUI/XMLParserModules/ExpatParser
 pkginclude_HEADERS = CEGUIExpatParser.h CEGUIExpatParserModule.h
 
-libCEGUIExpatParser_la_LIBADD = $(expat_LIBS)
+libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) ../../src/libCEGUIBase.la
diff -uNr -x '*.log' CEGUI-0.5.0/XMLParserModules/libxmlParser/Makefile.am CEGUI-0.5.0.work/XMLParserModules/libxmlParser/Makefile.am
--- CEGUI-0.5.0/XMLParserModules/libxmlParser/Makefile.am	2006-03-07 12:57:10.000000000 +0000
+++ CEGUI-0.5.0.work/XMLParserModules/libxmlParser/Makefile.am	2007-06-10 18:13:01.000000000 +0100
@@ -7,4 +7,4 @@
 pkgincludedir=$(prefix)/include/CEGUI/XMLParserModules/LibxmlParser
 pkginclude_HEADERS = CEGUILibxmlParser.h CEGUILibxmlParserModule.h
 
-libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS)
+libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) ../../src/libCEGUIBase.la
diff -uNr -x '*.log' CEGUI-0.5.0/XMLParserModules/TinyXMLParser/Makefile.am CEGUI-0.5.0.work/XMLParserModules/TinyXMLParser/Makefile.am
--- CEGUI-0.5.0/XMLParserModules/TinyXMLParser/Makefile.am	2006-03-07 14:44:24.000000000 +0000
+++ CEGUI-0.5.0.work/XMLParserModules/TinyXMLParser/Makefile.am	2007-06-10 18:12:34.000000000 +0100
@@ -8,6 +8,8 @@
                                    ceguitinyxml/tinyxmlerror.cpp \
                                    ceguitinyxml/tinyxmlparser.cpp
 
+libCEGUITinyXMLParser_la_LIBADD = ../../src/libCEGUIBase.la
+
 pkgincludedir=$(prefix)/include/CEGUI/XMLParserModules/TinyXMLParser
 pkginclude_HEADERS = CEGUITinyXMLParser.h CEGUITinyXMLParserModule.h
 
diff -uNr -x '*.log' CEGUI-0.5.0/XMLParserModules/XercesParser/Makefile.am CEGUI-0.5.0.work/XMLParserModules/XercesParser/Makefile.am
--- CEGUI-0.5.0/XMLParserModules/XercesParser/Makefile.am	2006-03-07 12:57:10.000000000 +0000
+++ CEGUI-0.5.0.work/XMLParserModules/XercesParser/Makefile.am	2007-06-10 18:13:26.000000000 +0100
@@ -6,4 +6,4 @@
 pkgincludedir=$(prefix)/include/CEGUI/XMLParserModules/XercesParser
 pkginclude_HEADERS = CEGUIXercesParser.h CEGUIXercesParserModule.h
 
-libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS)
+libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) ../../src/libCEGUIBase.la

cegui-0.5.0-lua51.patch:

--- NEW FILE cegui-0.5.0-lua51.patch ---
diff -ru --exclude '*.in' --exclude '*.~' --exclude '*.cache' --exclude configure CEGUI-0.5.0/aclocal.m4 CEGUI_work/aclocal.m4
--- CEGUI-0.5.0/aclocal.m4	2006-11-28 11:17:05.000000000 +0100
+++ CEGUI_work/aclocal.m4	2007-05-08 16:53:03.000000000 +0200
@@ -551,6 +551,17 @@
 
 AC_DEFUN([CEGUI_CHECK_LUA],[
     PKG_CHECK_MODULES(Lua, lua >= 5.0 lua < 5.1, [cegui_found_lua=yes], [cegui_found_lua=no])
+    
+    LUA_VERSION_FLAGS="";
+    if test x$cegui_found_lua = xno; then
+       PKG_CHECK_MODULES(Lua, lua >= 5.1, [cegui_found_lua=yes], [cegui_found_lua=no])
+       
+       if test x$cegui_found_lua = xyes; then
+	  LUA_VERSION_FLAGS="$LUA_VERSION_FLAGS -DLUA51"
+  	  AC_MSG_NOTICE([Lua version >=5.1])
+       fi
+    fi
+    AC_SUBST(LUA_VERSION_FLAGS)
 
     AC_ARG_ENABLE([lua-module], AC_HELP_STRING([--disable-lua-module], [Disables building of the Lua scripting module.]),
                 [cegui_with_lua=$enableval], [cegui_with_lua=yes])
diff -ru --exclude '*.in' --exclude '*.~' --exclude '*.cache' --exclude configure CEGUI-0.5.0/ScriptingModules/CEGUILua/LuaScriptModule/src/CEGUILua.cpp CEGUI_work/ScriptingModules/CEGUILua/LuaScriptModule/src/CEGUILua.cpp
--- CEGUI-0.5.0/ScriptingModules/CEGUILua/LuaScriptModule/src/CEGUILua.cpp	2006-06-19 22:20:17.000000000 +0200
+++ CEGUI_work/ScriptingModules/CEGUILua/LuaScriptModule/src/CEGUILua.cpp	2007-05-08 18:41:56.000000000 +0200
@@ -35,12 +35,10 @@
 
 // include Lua libs and tolua++
 extern "C" {
-#include "lua.h"
+#include "tolua++.h"
 #include "lualib.h"
-#include "lauxlib.h"
 }
 
-#include "tolua++.h"
 
 // prototype for bindings initialisation function
 int tolua_CEGUI_open(lua_State* tolua_S);
@@ -55,11 +53,36 @@
 *************************************************************************/
 LuaScriptModule::LuaScriptModule()
 {
+#ifdef LUA51
+       static const luaL_Reg lualibs[] = { 
+          {"", luaopen_base}, 
+          {LUA_LOADLIBNAME, luaopen_package}, 
+          {LUA_TABLIBNAME, luaopen_table}, 
+          {LUA_IOLIBNAME, luaopen_io}, 
+          {LUA_OSLIBNAME, luaopen_os}, 
+          {LUA_STRLIBNAME, luaopen_string}, 
+          {LUA_MATHLIBNAME, luaopen_math}, 
+#if defined(DEBUG) || defined (_DEBUG) 
+          {LUA_DBLIBNAME, luaopen_debug}, 
+#endif 
+          {NULL, NULL} 
+        };
+#endif /* LUA51 */
+
 	// create a lua state
 	d_ownsState = true;
 	d_state = lua_open();
 
 	// init all standard libraries
+#ifdef LUA51
+        const luaL_Reg *lib = lualibs; 
+        for (; lib->func; lib++) 
+        { 
+           lua_pushcfunction(d_state, lib->func); 
+           lua_pushstring(d_state, lib->name); 
+           lua_call(d_state, 1, 0); 
+        }	
+#else /* LUA51 */
 	luaopen_base(d_state);
 	luaopen_io(d_state);
 	luaopen_string(d_state);
@@ -68,7 +91,7 @@
 #if defined(DEBUG) || defined (_DEBUG)
 	luaopen_debug(d_state);
 #endif
-
+#endif /* LUA51 */
 	setModuleIdentifierString();
 }
 
diff -ru --exclude '*.in' --exclude '*.~' --exclude '*.cache' --exclude configure CEGUI-0.5.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am CEGUI_work/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
--- CEGUI-0.5.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2006-07-25 10:34:51.000000000 +0200
+++ CEGUI_work/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2007-05-08 16:56:04.000000000 +0200
@@ -1,6 +1,7 @@
 INCLUDES = -I$(top_srcdir)/include \
            -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++ \
-           -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include
+           -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include \
+           ${LUA_VERSION_FLAGS}
 lib_LTLIBRARIES = libCEGUILuaScriptModule.la
 
 libCEGUILuaScriptModule_la_LDFLAGS = -version-info @CEGUI_VERSION_INFO@

cegui-0.5.0-userverso.patch:

--- NEW FILE cegui-0.5.0-userverso.patch ---
--- CEGUI-0.5.0/src/CEGUIDynamicModule.cpp.orig	2006-08-09 20:39:16.000000000 +0100
+++ CEGUI-0.5.0/src/CEGUIDynamicModule.cpp	2007-06-02 22:07:49.000000000 +0100
@@ -65,6 +65,31 @@
     // see if we need to add the leading 'lib'
     if (d_moduleName.substr(0, 3) != "lib")
         d_moduleName.insert(0, "lib");
+
+    // Insist on opening the versioned .so so that the development package
+    // does not need to be installed
+    if (d_moduleName == "libCEGUIBase.so")
+    {
+        d_moduleName += ".1";
+    }
+    else if (d_moduleName == "libCEGUIFalagardWRBase.so")
+    {
+        d_moduleName += ".1";
+    }
+    else if (d_moduleName == "libCEGUILuaScriptModule.so")
+    {
+        d_moduleName += ".1";
+    }
+    else if (d_moduleName == "libCEGUItoluapp.so")
+    {
+        d_moduleName += ".1";
+    }
+    else
+    {
+        d_moduleName += ".0";
+    }
+
+
 #endif
 
     // Optionally add a _d to the module name for the debug config on Win32


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cegui/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Jun 2006 21:19:57 -0000	1.2
+++ .cvsignore	4 Jul 2007 18:27:18 -0000	1.3
@@ -1 +1,2 @@
-cegui_mk2-source-0.4.1.tar.bz2
+CEGUI-0.5.0b.tar.gz
+CEGUI-DOCS-0.5.0.tar.gz


Index: cegui.spec
===================================================================
RCS file: /cvs/extras/rpms/cegui/FC-6/cegui.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cegui.spec	28 Aug 2006 23:13:27 -0000	1.4
+++ cegui.spec	4 Jul 2007 18:27:18 -0000	1.5
@@ -1,28 +1,33 @@
+%define         VER 0.5.0
+
 Name:           cegui
-Version:        0.4.1
-Release:        11%{?dist}
+Version:        %{VER}b
+Release:        4%{?dist}
 Summary:        Free library providing windowing and widgets for graphics APIs / engines
-
 Group:          System Environment/Libraries
-License:        LGPL
-URL:            http://www.cegui.org.uk/
-Source0:        http://dl.sf.net/crayzedsgui/%{name}_mk2-source-%{version}.tar.bz2
-Patch0:         cegui_mk2-0.4.1-pcre.patch
-Patch1:         cegui_mk2-0.4.1-tolua++.patch
-Patch2:         cegui_mk2-0.4.1-fixtinyxml.patch
-Patch3:         cegui_mk2-0.4.1-64bit.patch
-Patch4:         cegui_mk2-0.4.1-useverso.patch
-Patch5:         cegui_mk2-0.4.1-fixheader.patch
+License:        MIT
+URL:            http://www.cegui.org.uk
+Source0:        http://dl.sf.net/crayzedsgui/CEGUI-%{version}.tar.gz
+Source1:        http://dl.sf.net/crayzedsgui/CEGUI-DOCS-%{VER}.tar.gz
+Patch0:         cegui-0.5.0-userverso.patch
+Patch1:         cegui-0.5.0-lua51.patch
+Patch2:         cegui-0.5.0-fixweaksymbol.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gawk
-BuildRequires:  freetype-devel > 2.0.0
+BuildRequires:  autoconf
+BuildRequires:  automake17
 BuildRequires:  DevIL-devel
+BuildRequires:  expat-devel
+BuildRequires:  freetype-devel > 2.0.0
+BuildRequires:  libxml2-devel
+BuildRequires:  libICE-devel
+BuildRequires:  libGLU-devel
+BuildRequires:  libtool
+BuildRequires:  libSM-devel
+BuildRequires:  lua-devel >= 0.5.1
 BuildRequires:  pcre-devel
 BuildRequires:  pkgconfig >= 0.9.0
-BuildRequires:  libGLU-devel
-BuildRequires:  tolua++-devel
-Provides:       CEGUI = %{version}-%{release}
-Provides:       cegui_mk2 = %{version}-%{release}
+BuildRequires:  SILLY-devel
+BuildRequires:  xerces-c-devel
 
 %description
 Crazy Eddie's GUI System is a free library providing windowing and widgets for
@@ -31,14 +36,12 @@
 targeted at games developers who should be spending their time creating great
 games, not building GUI sub-systems!
 
+
 %package devel
 Summary:        Development files for cegui
 Group:          Development/Libraries
-Requires:       cegui = %{version}-%{release}
-Requires:       pkgconfig
+Requires:       %{name} = %{version}-%{release}
 Requires:       libGLU-devel
-Provides:       CEGUI-devel = %{version}-%{release}
-Provides:       cegui_mk2-devel = %{version}-%{release}
 
 %description devel
 Development files for cegui
@@ -48,50 +51,41 @@
 Summary:        API documentation for cegui
 Group:          Documentation
 Requires:       cegui-devel = %{version}-%{release}
-Provides:       CEGUI-devel-doc = %{version}-%{release}
-Provides:       cegui_mk2-devel-doc = %{version}-%{release}
-Provides:       cegui-devel-docs = %{version}-%{release}
-Obsoletes:      cegui-devel-docs
 
 %description devel-doc
 API and Falagard skinning documentation for cegui
 
 
 %prep
-%setup -q -n %{name}_mk2
+%setup -qb1 -qn CEGUI-%{VER}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-#Delete bundled pcre to avoid any accidental building against it.
-rm -rf src/pcre
-#Delete bundled lua / tolua++ to avoid any accidental building against it.
-rm -rf ScriptingModules/CEGUILua/lua_and_tolua++
-#Fix documentation link in html file
-sed -i 's/documentation\/api_reference/api_reference/' ReadMe.html
 
+# Permission fixes for debuginfo RPM
+chmod -x include/falagard/*.h
+
+# Delete zero length file
+rm -f documentation/api_reference/keepme
+
+# Run automake/autoconf due to patches 1 & 2
+touch INSTALL NEWS
+automake-1.7
+autoconf
 
 %build
-#Regenerate bindings with system tolua++. The reason for the change directory
-#(pushd) before calling tolua++, is because tolua++ only looks in the current
-#directory for the files depended on my CEGUI.pkg. If a full path is specified,
-#it fails.
-pushd ScriptingModules/CEGUILua/LuaScriptModule/package/
-tolua++ -o ../src/lua_CEGUI.cpp CEGUI.pkg
-popd
-%configure --disable-irrlicht-renderer --disable-samples --with-pic --without-xerces-c
-make %{?_smp_mflags}
+%configure --disable-static --disable-corona --enable-devil \
+           --enable-lua-module --disable-irrlicht-renderer --disable-samples \
+           --with-default-xml-parser=ExpatParser --enable-silly \
+           --with-default-image-codec=SILLYImageCodec --with-pic
+
+make %{?_smp_mflags} LIBTOOL="/usr/bin/libtool"
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/*.a
-rm -rf %{buildroot}%{_includedir}/CEGUI/renderers/IrrlichtRenderer
-#Cleanup CVS stuff in the documentation area before the %%doc section
-rm -rf documentation/CVS documentation/api_reference/CVS documentation/api_reference/keepme documentation/api_reference/*.md5
+# Strange but FC6 needs libtool here also on x86_64 to avoid rpath problems.
+make install DESTDIR=%{buildroot} LIBTOOL="/usr/bin/libtool"
 
 
 %clean
@@ -104,44 +98,65 @@
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/libCEGUIBase.so.0
-%{_libdir}/libCEGUIBase.so.0.0.0
-%{_libdir}/libCEGUIFalagardBase.so.0
-%{_libdir}/libCEGUIFalagardBase.so.0.0.0
-%{_libdir}/libCEGUILuaScriptModule.so.0
-%{_libdir}/libCEGUILuaScriptModule.so.0.0.0
-%{_libdir}/libCEGUIOpenGLRenderer.so.0
-%{_libdir}/libCEGUIOpenGLRenderer.so.0.0.0
-%{_libdir}/libCEGUITaharezLook.so.0
-%{_libdir}/libCEGUITaharezLook.so.0.0.0
-%{_libdir}/libCEGUIWindowsLook.so.0
-%{_libdir}/libCEGUIWindowsLook.so.0.0.0
-#The pristine sources generate this library, which is not needed when building
-#against the system tolua++/lua.
-##%%{_libdir}/libCEGUIluatoluapp.so.0
-##%%{_libdir}/libCEGUIluatoluapp.so.0.0.0
-%doc AUTHORS COPYING README TinyXML-License
+%{_libdir}/libCEGUIBase.so.1*
+%{_libdir}/libCEGUIDevILImageCodec.so.0*
+%{_libdir}/libCEGUIExpatParser.so.0*
+%{_libdir}/libCEGUIFalagardWRBase.so.1*
+%{_libdir}/libCEGUILibxmlParser.so.0*
+%{_libdir}/libCEGUILuaScriptModule.so.1*
+%{_libdir}/libCEGUIOpenGLRenderer.so.0*
+%{_libdir}/libCEGUITGAImageCodec.so.0*
+%{_libdir}/libCEGUITinyXMLParser.so.0*
+%{_libdir}/libCEGUIXercesParser.so.0*
+%{_libdir}/libCEGUISILLYImageCodec.so.0*
+%{_libdir}/libCEGUItoluapp.so.1*
+%exclude %{_libdir}/*.la
+%exclude %{_libdir}/*.a
+%doc AUTHORS ChangeLog COPYING README TinyXML-License TODO
+
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libCEGUIBase.so
-%{_libdir}/libCEGUIFalagardBase.so
+%{_libdir}/libCEGUIDevILImageCodec.so
+%{_libdir}/libCEGUIExpatParser.so
+%{_libdir}/libCEGUIFalagardWRBase.so
+%{_libdir}/libCEGUILibxmlParser.so
 %{_libdir}/libCEGUILuaScriptModule.so
 %{_libdir}/libCEGUIOpenGLRenderer.so
-%{_libdir}/libCEGUITaharezLook.so
-%{_libdir}/libCEGUIWindowsLook.so
-#The pristine sources generate this library , which is not needed when building
-#against the system tolua++/lua.
-#%%{_libdir}/libCEGUIluatoluapp.so
+%{_libdir}/libCEGUITGAImageCodec.so
+%{_libdir}/libCEGUITinyXMLParser.so
+%{_libdir}/libCEGUIXercesParser.so
+%{_libdir}/libCEGUISILLYImageCodec.so
+%{_libdir}/libCEGUItoluapp.so
 %{_libdir}/pkgconfig/CEGUI-OPENGL.pc
 %{_libdir}/pkgconfig/CEGUI.pc
 %{_includedir}/CEGUI
 
+
 %files devel-doc
-%doc documentation/Falagard_Skinning_Docs.pdf documentation/api_reference
+%doc documentation/FalagardSkinning.pdf documentation/api_reference
 
 
 %changelog
+* Sat Jun 30 2007 Ian Chapman <packages at amiga-hardware.com> 0.5.0b-4%{?dist}
+- release bump
+
+* Sun Jun 17 2007 Ian Chapman <packages at amiga-hardware.com> 0.5.0b-3%{?dist}
+- rpath fixes for x86_64
+
+* Sun Jun 10 2007 Ian Chapman <packages at amiga-hardware.com> 0.5.0b-2%{?dist}
+- Added patch to fix undefined-non-weak-symbol warnings
+
+* Wed May 30 2007 Ian Chapman <packages at amiga-hardware.com> 0.5.0b-1%{?dist}
+- Upgrade to 0.5.0b
+- Added patch from Gentoo to compile with lua 5.1
+- Updated the patch to use versioned .so for dlopen()
+- Dropped several patches as they are no longer needed
+- Dropped useless provides. Nothing used them anyway
+- Added support for the SILLY image codec
+- Added support for xerces-c
+
 * Mon Aug 28 2006 Ian Chapman <packages at amiga-hardware.com> 0.4.1-11%{?dist}
 - Release bump for FC6 mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cegui/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Jun 2006 21:19:57 -0000	1.2
+++ sources	4 Jul 2007 18:27:18 -0000	1.3
@@ -1 +1,2 @@
-7b1df5ba4dd91376b79bd5968a429e23  cegui_mk2-source-0.4.1.tar.bz2
+b42322a33c6a06eede76b15f75694a17  CEGUI-0.5.0b.tar.gz
+e268b5812f146ee1ff9ba4c07ff501b7  CEGUI-DOCS-0.5.0.tar.gz


--- cegui_mk2-0.4.1-64bit.patch DELETED ---


--- cegui_mk2-0.4.1-fixheader.patch DELETED ---


--- cegui_mk2-0.4.1-fixtinyxml.patch DELETED ---


--- cegui_mk2-0.4.1-pcre.patch DELETED ---


--- cegui_mk2-0.4.1-tolua++.patch DELETED ---


--- cegui_mk2-0.4.1-useverso.patch DELETED ---




More information about the fedora-extras-commits mailing list