rpms/glabels/F-12 glabels-libxml-XML_PARSE_HUGE.patch, NONE, 1.1 glabels.spec, 1.24, 1.25 sources, 1.10, 1.11

[Jef Spaleta]

Author: jspaleta

Update of /cvs/pkgs/rpms/glabels/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21682

Modified Files:
	glabels.spec sources 
Added Files:
	glabels-libxml-XML_PARSE_HUGE.patch 
Log Message:
* Wed Nov 25 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.2.6-1
- New upstream release which fixes bug 528352


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/F-12/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	27 Nov 2009 01:25:36 -0000	1.25
@@ -1,6 +1,6 @@
 Name:		glabels
-Version:	2.2.5
-Release:	2%{?dist}
+Version:	2.2.6
+Release:	1%{?dist}
 Summary:	A program for creating labels and business cards for GNOME
 
 Group:		Applications/Publishing
@@ -9,9 +9,13 @@ 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
+BuildRequires:  gnome-doc-utils
+BuildRequires:  gnome-doc-utils-stylesheets
 BuildRequires:	evolution-data-server-devel >= 1.8
 BuildRequires:	gettext
 BuildRequires:	gtk2 >= 2.10
@@ -74,6 +78,7 @@ This package contains the runtime docume
 
 %prep
 %setup -q
+%patch0 -p1 -b .libxml-XML_PARSE_HUGE
 
 
 %build
@@ -159,6 +164,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Nov 25 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.2.6-1
+- New upstream release which fixes bug 528352
+
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	30 May 2009 04:02:49 -0000	1.10
+++ sources	27 Nov 2009 01:25:36 -0000	1.11
@@ -1 +1 @@
-a98932cce677f72af8cba2add00adfe3  glabels-2.2.5.tar.gz
+594fffa4116a88772752c2582aa3605d  glabels-2.2.6.tar.gz