From 99e7fae08f875b9af003372b6d1be23de792cca1 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Apr 02 2011 13:22:40 +0000
Subject: drop integrated libgsf.gnome634435.avoidcrash.patch


---

diff --git a/libgsf.gnome634435.avoidcrash.patch b/libgsf.gnome634435.avoidcrash.patch
deleted file mode 100644
index 5949e13..0000000
--- a/libgsf.gnome634435.avoidcrash.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru libgsf-1.14.19/gsf/gsf-msole-utils.c libgsf-1.14.19.foo/gsf/gsf-msole-utils.c
---- libgsf-1.14.19/gsf/gsf-msole-utils.c	2010-08-29 01:23:25.000000000 +0100
-+++ libgsf-1.14.19.foo/gsf/gsf-msole-utils.c	2010-11-09 16:31:16.000000000 +0000
-@@ -894,8 +894,13 @@
- 		error = NULL;
- 		if (!parse_vt_cf (res, data, data_end, &error)) {
- 			/* suck, we can't propagate the error upwards */
--			g_warning ("error: %s", error->message);
--			g_error_free (error);
-+			if (error) {
-+			    g_warning ("error: %s", error->message);
-+			    g_error_free (error);
-+			}
-+			else {
-+			    g_warning ("unknown error parsing vt_cf");
-+			}
- 			g_free (res);
- 			res = NULL;
- 		}
diff --git a/libgsf.spec b/libgsf.spec
index a08b058..8240722 100644
--- a/libgsf.spec
+++ b/libgsf.spec
@@ -17,7 +17,6 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel, perl-XML-Parser
 BuildRequires: libtool, libxml2-devel, glib2-devel, bzip2-devel, gettext
 BuildRequires: libbonobo-devel, pygtk2-devel, intltool, gnome-vfs2-devel
-Patch0: libgsf.gnome634435.avoidcrash.patch
 
 %description
 A library for reading and writing structured files (e.g. MS OLE and Zip)
@@ -63,7 +62,6 @@ Python bindings for libgsf
 
 %prep
 %setup -q
-%patch0 -p1 -b .gnome634435
 
 %build
 %configure --disable-gtk-doc --disable-static
@@ -143,6 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sat Apr 02 2011 Caolán McNamara <caolanm@redhat.com> 1.14.20-1
 - latest version
+- drop integrated libgsf.gnome634435.avoidcrash.patch
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.14.19-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild