rpms/cegui/devel cegui-0.6.2-new-tinyxml.patch, NONE, 1.1 cegui.spec, 1.22, 1.23

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/cegui/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3586

Modified Files:
	cegui.spec 
Added Files:
	cegui-0.6.2-new-tinyxml.patch 
Log Message:
* Mon Jun 21 2010 Hans de Goede <hdegoede at redhat.com> 0.6.2-6
- Fix building with latest tinyxml (#599850)


cegui-0.6.2-new-tinyxml.patch:
 CEGUITinyXMLParser.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cegui-0.6.2-new-tinyxml.patch ---
diff -up CEGUI-0.6.2/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp~ CEGUI-0.6.2/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
--- CEGUI-0.6.2/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp~	2008-11-27 14:39:04.000000000 +0100
+++ CEGUI-0.6.2/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp	2010-06-21 17:02:21.068231195 +0200
@@ -131,10 +131,10 @@ namespace CEGUI
         {
             switch(childNode->Type())
             {
-            case CEGUI_TINYXML_NAMESPACE::TiXmlNode::ELEMENT:
+            case CEGUI_TINYXML_NAMESPACE::TiXmlNode::TINYXML_ELEMENT:
                 processElement(childNode->ToElement());
                 break;
-            case CEGUI_TINYXML_NAMESPACE::TiXmlNode::TEXT:
+            case CEGUI_TINYXML_NAMESPACE::TiXmlNode::TINYXML_TEXT:
                 if (childNode->ToText()->Value() != '\0')
                     d_handler->text((utf8*)childNode->ToText()->Value());
                 break;


Index: cegui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cegui/devel/cegui.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- cegui.spec	7 Feb 2010 07:28:57 -0000	1.22
+++ cegui.spec	21 Jun 2010 15:27:47 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           cegui
 Version:        0.6.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Free library providing windowing and widgets for graphics APIs / engines
 Group:          System Environment/Libraries
 License:        MIT
@@ -17,6 +17,7 @@ Patch1:         cegui-0.6.0-release-as-s
 Patch2:         cegui-0.6.0-userverso.patch
 # TODO: submit upstream
 Patch3:         cegui-0.6.2-new-DevIL.patch
+Patch4:         cegui-0.6.2-new-tinyxml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  DevIL-devel
 BuildRequires:  expat-devel
@@ -67,6 +68,7 @@ API and Falagard skinning documentation 
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # Permission fixes for debuginfo RPM
 chmod -x include/falagard/*.h
@@ -138,6 +140,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jun 21 2010 Hans de Goede <hdegoede at redhat.com> 0.6.2-6
+- Fix building with latest tinyxml (#599850)
+
 * Sun Feb 07 2010 Bruno Wolff III <bruno at wolff.to> - 0.6.2-5
 - Rebuild for xerces update.