From 4036c179d35559223b3363d0ab1f94c46ab54af8 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Jul 16 2010 22:49:24 +0000
Subject: Add patch for bug 536920


---

diff --git a/fontforge-20100501-splinesets.patch b/fontforge-20100501-splinesets.patch
new file mode 100644
index 0000000..497758e
--- /dev/null
+++ b/fontforge-20100501-splinesets.patch
@@ -0,0 +1,20 @@
+diff -Nur fontforge-20100501.orig/fontforge/splineutil.c fontforge-20100501/fontforge/splineutil.c
+--- fontforge-20100501.orig/fontforge/splineutil.c	2010-04-21 18:53:25.000000000 -0600
++++ fontforge-20100501/fontforge/splineutil.c	2010-07-16 16:26:34.000000000 -0600
+@@ -4629,14 +4629,14 @@
+ 	if ( r==NULL )
+ return( NULL );
+ 	spl = r->layers[0].splines;
+-	r = r->next;
++	do { r = r->next; } while ( r!=NULL && r->layers[0].splines==NULL );
+     }
+     while ( r!=NULL ) {
+ 	while ( spl!=NULL && spl->next!=r->layers[0].splines )
+ 	    spl = spl->next;
+ 	spl->next = NULL;
+ 	spl = r->layers[0].splines;
+-	r = r->next;
++	do { r = r->next; } while ( r!=NULL && r->layers[0].splines==NULL );
+     }
+ return( layer->splines );
+ }
diff --git a/fontforge.spec b/fontforge.spec
index 54673c2..ea6cfbc 100644
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -5,7 +5,7 @@
 
 Name:           fontforge
 Version:        20100501
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -16,6 +16,8 @@ Source1:        fontforge.desktop
 Source2:        http://downloads.sourceforge.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
 Source3:        fontforge.xml
 Patch1:         fontforge-20090224-pythondl.patch
+# See Bug https://bugzilla.redhat.com/show_bug.cgi?id=536920 
+Patch2:		fontforge-20100501-splinesets.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       xdg-utils
@@ -57,6 +59,7 @@ to compile applications against fontforge.
 %setup -q -n %{name}-%{version}
 
 %patch1 -p1
+%patch2 -p1
 
 mkdir htdocs
 tar xjf %{SOURCE2} -C htdocs
@@ -147,6 +150,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Jul 16 2010 Kevin Fenzi <kevin@tummy.com> - 20100501-2
+- Add patch for bug 536920
+
 * Wed May 19 2010 Kevin Fenzi <kevin@tummy.com> - 20100501-1
 - Update to 20100501