--- a/ChangeLog	Fri Jun 13 06:53:06 2008 +0000
+++ b/ChangeLog	Fri Jun 13 07:47:42 2008 +0000
@@ -1,8 +1,15 @@
+2008-06-13  Damien Carbery <[email protected]>
+
+        * base-specs/cairo.spec: Comment out patch2 because of change to
+          Freetype in snv_91 breaks build.
+
 2008-06-13  Takao Fujiwara  <[email protected]>
 
-	* base-specs/gnome-session.spec: Updated to merge .po files with po-logout.
+	* base-specs/gnome-session.spec: Updated to merge .po files with
+	  po-logout.
 	* po-sun/Makefile: Updated to add gnome-session/po-logout.
-	* po-sun/gnome-session/po-logout: Added. Copied strings from gnome-panel.
+	* po-sun/gnome-session/po-logout: Added. Copied strings from
+	  gnome-panel.
 
 2008-06-10  Dave Lin <[email protected]>
 

--- a/base-specs/cairo.spec	Fri Jun 13 06:53:06 2008 +0000
+++ b/base-specs/cairo.spec	Fri Jun 13 07:47:42 2008 +0000
@@ -18,7 +18,7 @@
 #owner:erwannc date:2000-00-00 type:feature bugzilla:6997
 Patch1:       cairo-01-uninstalled-pc.diff
 #owner:erwannc date:2006-11-02 type:feature 
-Patch2:       cairo-02-full-hinting.diff
+##Patch2:       cairo-02-full-hinting.diff
 #owner:dkenny date:2008-04-18 type:bug bugster:????
 Patch3:       cairo-03-no-pixman-dep.diff
 URL:          http://www.cairographics.org
@@ -66,7 +66,8 @@
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
+## Commented out because of change to Freetype in snv_91 breaks build.
+##%patch2 -p1
 %patch3 -p1
 
 %build
@@ -125,6 +126,8 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Jun 13 2008 - [email protected]
+- Comment out patch2 because of change to Freetype in snv_91 breaks build.
 * Sun Apr 20 2008 - [email protected]
 - Add -D_POSIX_PTHREAD_SEMANTICS to CFLAGS to fix sparc build (ctime_r error).
 * Fri Apr 18 2008 - [email protected]