rpms/cegui/devel cegui-0.5.0-xerces-c-2.8.patch, NONE, 1.1 cegui.spec, 1.8, 1.9

[Ian Chapman (oddsocks)]

Author: oddsocks

Update of /cvs/pkgs/rpms/cegui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28261

Modified Files:
	cegui.spec 
Added Files:
	cegui-0.5.0-xerces-c-2.8.patch 
Log Message:


cegui-0.5.0-xerces-c-2.8.patch:

--- NEW FILE cegui-0.5.0-xerces-c-2.8.patch ---
diff -up CEGUI-0.5.0/XMLParserModules/XercesParser/CEGUIXercesParser.cpp~ CEGUI-0.5.0/XMLParserModules/XercesParser/CEGUIXercesParser.cpp
--- CEGUI-0.5.0/XMLParserModules/XercesParser/CEGUIXercesParser.cpp~	2008-02-11 11:02:37.000000000 +0100
+++ CEGUI-0.5.0/XMLParserModules/XercesParser/CEGUIXercesParser.cpp	2008-02-11 11:02:37.000000000 +0100
@@ -34,6 +34,7 @@
 #include "CEGUIXMLHandler.h"
 #include "CEGUIXMLAttributes.h"
 #include "CEGUIPropertyHelper.h"
+#include <xercesc/validators/common/Grammar.hpp>
 
 #include <iostream> // Debug 
 // Start of CEGUI namespace section


Index: cegui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cegui/devel/cegui.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cegui.spec	29 Aug 2007 20:44:48 -0000	1.8
+++ cegui.spec	13 Feb 2008 18:58:30 -0000	1.9
@@ -1,19 +1,20 @@
-%define         VER 0.5.0
+%define VER 0.5.0
 
 Name:           cegui
 Version:        %{VER}b
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Free library providing windowing and widgets for graphics APIs / engines
 Group:          System Environment/Libraries
 # Most of the source is MIT with the exception of the modified and embedded
 # tolua++ which is "Freely redistributable without restriction"
 License:        MIT and Freely redistributable without restriction
 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
+Source0:        http://downloads.sourceforge.net/crayzedsgui/CEGUI-%{version}.tar.gz
+Source1:        http://downloads.sourceforge.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
+Patch3:         cegui-0.5.0-xerces-c-2.8.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf
 BuildRequires:  automake17
@@ -63,6 +64,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Permission fixes for debuginfo RPM
 chmod -x include/falagard/*.h
@@ -70,11 +72,17 @@
 # Delete zero length file
 rm -f documentation/api_reference/keepme
 
+# Encoding fixes
+iconv -f iso8859-1 AUTHORS -t utf8 > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
+iconv -f iso8859-1 TODO -t utf8 > TODO.conv && mv -f TODO.conv README
+iconv -f iso8859-1 README -t utf8 > README.conv && mv -f README.conv README
+
 # Run automake/autoconf due to patches 1 & 2
 touch INSTALL NEWS
 automake-1.7
 autoconf
 
+
 %build
 %configure --disable-static --disable-corona --enable-devil \
            --enable-lua-module --disable-irrlicht-renderer --disable-samples \
@@ -100,18 +108,7 @@
 
 %files
 %defattr(-,root,root,-)
-%{_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*
+%{_libdir}/libCEGUI*.so.*
 %exclude %{_libdir}/*.la
 %exclude %{_libdir}/*.a
 %doc AUTHORS ChangeLog COPYING README TinyXML-License TODO
@@ -119,18 +116,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libCEGUIBase.so
-%{_libdir}/libCEGUIDevILImageCodec.so
-%{_libdir}/libCEGUIExpatParser.so
-%{_libdir}/libCEGUIFalagardWRBase.so
-%{_libdir}/libCEGUILibxmlParser.so
-%{_libdir}/libCEGUILuaScriptModule.so
-%{_libdir}/libCEGUIOpenGLRenderer.so
-%{_libdir}/libCEGUITGAImageCodec.so
-%{_libdir}/libCEGUITinyXMLParser.so
-%{_libdir}/libCEGUIXercesParser.so
-%{_libdir}/libCEGUISILLYImageCodec.so
-%{_libdir}/libCEGUItoluapp.so
+%{_libdir}/*.so
 %{_libdir}/pkgconfig/CEGUI-OPENGL.pc
 %{_libdir}/pkgconfig/CEGUI.pc
 %{_includedir}/CEGUI
@@ -141,6 +127,11 @@
 
 
 %changelog
+* Wed Feb 13 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.5.0b-7
+- Added patch for new xerces-c. Courtesy of Hans de Goede
+- Converted some documentation to UTF8
+- Minor spec cleanups
+
 * Wed Aug 29 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.5.0b-6
 - Yet another release bump, for building against expat2.