rpms/compat-wxGTK26/devel wxGTK-2.6.3-expat2.patch, NONE, 1.1 compat-wxGTK26.spec, 1.7, 1.8

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/compat-wxGTK26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7529

Modified Files:
	compat-wxGTK26.spec 
Added Files:
	wxGTK-2.6.3-expat2.patch 
Log Message:
* Tue Aug 28 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-7
- rebuilt for new expat (#195888)


wxGTK-2.6.3-expat2.patch:

--- NEW FILE wxGTK-2.6.3-expat2.patch ---
diff -Nur wxGTK-2.6.3-orig/src/xml/xml.cpp wxGTK-2.6.3/src/xml/xml.cpp
--- wxGTK-2.6.3-orig/src/xml/xml.cpp	2006-03-22 00:42:05.000000000 +0100
+++ wxGTK-2.6.3/src/xml/xml.cpp	2007-08-28 11:57:10.000000000 +0200
@@ -559,7 +559,7 @@
         {
             wxString error(XML_ErrorString(XML_GetErrorCode(parser)),
                            *wxConvCurrent);
-            wxLogError(_("XML parsing error: '%s' at line %d"),
+            wxLogError(_("XML parsing error: '%s' at line %u"),
                        error.c_str(),
                        XML_GetCurrentLineNumber(parser));
             ok = false;


Index: compat-wxGTK26.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/compat-wxGTK26.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- compat-wxGTK26.spec	28 Aug 2007 09:51:00 -0000	1.7
+++ compat-wxGTK26.spec	28 Aug 2007 09:58:52 -0000	1.8
@@ -14,6 +14,7 @@
 Patch2:         wxGTK-2.6.3-gtk-crash.patch
 Patch3:         wxGTK-2.6.3-g_thread_init.patch
 #Patch4:         wxGTK-2.6.3-tooltips.patch
+Patch5:         wxGTK-2.6.3-expat2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
@@ -52,6 +53,7 @@
 %patch2 -p1 -b .gtk-crash
 %patch3 -p1 -b .g_thread_init
 #patch4 -p1 -b .tooltips
+%patch5 -p1 -b .expat2
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure