rpms/glabels/devel glabels-libxml-XML_PARSE_HUGE.patch, NONE, 1.1 glabels.spec, 1.24, 1.25

[Peter Gordon]

Author: pgordon

Update of /cvs/pkgs/rpms/glabels/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17385

Modified Files:
	glabels.spec 
Added Files:
	glabels-libxml-XML_PARSE_HUGE.patch 
Log Message:
Fix bug 528352 (glabels can't open saved projects) from recent libxml behavior changes. Add backported patch from upstream git. (Thanks, Ralf.)

glabels-libxml-XML_PARSE_HUGE.patch:
 xml-label.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE glabels-libxml-XML_PARSE_HUGE.patch ---
diff -Naur glabels-2.2.5.orig/src/xml-label.c glabels-2.2.5/src/xml-label.c
--- glabels-2.2.5.orig/src/xml-label.c	2008-03-25 02:33:04.000000000 +0100
+++ glabels-2.2.5/src/xml-label.c	2009-10-12 08:09:32.000000000 +0200
@@ -184,7 +184,7 @@
 	filename = g_filename_from_utf8 (utf8_filename, -1, NULL, NULL, NULL);
 	g_return_val_if_fail (filename, NULL);
 
-	doc = xmlParseFile (filename);
+        doc = xmlReadFile (filename, NULL, XML_PARSE_HUGE);
 	if (!doc) {
 		g_message (_("xmlParseFile error"));
 		*status = XML_LABEL_ERROR_OPEN_PARSE;
@@ -221,7 +221,7 @@
 
 	gl_debug (DEBUG_XML, "START");
 
-	doc = xmlParseDoc ((xmlChar *) buffer);
+        doc = xmlReadDoc ((xmlChar *) buffer, NULL, NULL, XML_PARSE_HUGE);
 	if (!doc) {
 		g_message (_("xmlParseFile error"));
 		*status = XML_LABEL_ERROR_OPEN_PARSE;


Index: glabels.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/devel/glabels.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- glabels.spec	25 Jul 2009 00:17:10 -0000	1.24
+++ glabels.spec	12 Oct 2009 21:04:57 -0000	1.25
@@ -1,6 +1,6 @@
 Name:		glabels
 Version:	2.2.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A program for creating labels and business cards for GNOME
 
 Group:		Applications/Publishing
@@ -9,6 +9,8 @@ URL:		http://glabels.sf.net
 
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 
+Patch0: 	%{name}-libxml-XML_PARSE_HUGE.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -74,6 +76,7 @@ This package contains the runtime docume
 
 %prep
 %setup -q
+%patch0 -p1 -b .libxml-XML_PARSE_HUGE
 
 
 %build
@@ -159,6 +162,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 12 2009 Peter Gordon <peter at thecodergeek.com> - 2.2.5-2
+- Apply backported patch from upstream git as a fix for recent changes in
+  libxml behavior:
+  + libxml-XML_PARSE_HUGE.patch
+- Thanks to Ralf Corsepius for the bug report and patch.
+- Resolves: #528352 (glabels can't read saved projects)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild