rpms/glib2/devel glib-2.7.5-convert.patch, NONE, 1.1 glib2.spec, 1.45, 1.46

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25741

Modified Files:
	glib2.spec 
Added Files:
	glib-2.7.5-convert.patch 
Log Message:
Fix an infinite loop in g_convert_with_iconv


glib-2.7.5-convert.patch:
 gconvert.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE glib-2.7.5-convert.patch ---
--- glib-2.7.5/glib/gconvert.c.convert	2005-08-03 10:14:54.629687000 -0400
+++ glib-2.7.5/glib/gconvert.c	2005-08-03 10:15:12.936364000 -0400
@@ -544,6 +544,7 @@
 	    {
 	    case EINVAL:
 	      /* Incomplete text, do not report an error */
+	      done = TRUE;
 	      break;
 	    case E2BIG:
 	      {


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- glib2.spec	3 Aug 2005 04:12:46 -0000	1.45
+++ glib2.spec	3 Aug 2005 14:16:12 -0000	1.46
@@ -1,14 +1,13 @@
-ExclusiveArch: s390 s390x
 Summary: A library of handy utility functions.
 Name: glib2
 Version: 2.7.5
-Release: 3
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
-Patch0: glib-2.7.5-atomic.patch
+Patch0: glib-2.7.5-convert.patch
 Conflicts: libgnomeui <= 2.2.0
 BuildRoot: %{_tmppath}/glib-%{PACKAGE_VERSION}-root
 BuildRequires: pkgconfig >= 0.8
@@ -38,7 +37,7 @@
 
 %prep
 %setup -q -n glib-%{version}
-%patch0 -p1 -b .atomic
+%patch0 -p1 -b .convert
 
 %build