From afafd2c4d9d0d87d03790067356ccc33c6ab8643 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@fedoraproject.org>
Date: May 03 2006 09:11:41 +0000
Subject: Update to new upstream 1.1.4


---

diff --git a/.cvsignore b/.cvsignore
index a721366..c1ad2f6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cairo-1.1.2.tar.gz
+cairo-1.1.4.tar.gz
diff --git a/cairo.spec b/cairo.spec
index 57372f2..66a1f07 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -3,8 +3,8 @@
 
 Summary:   A vector graphics library
 Name:      cairo
-Version:   1.1.2
-Release:   2
+Version:   1.1.4
+Release:   1
 URL:       http://cairographics.org
 Source0:   %{name}-%{version}.tar.gz
 License:   LGPL/MPL
@@ -23,9 +23,6 @@ BuildRequires: libpng-devel
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: fontconfig-devel >= %{fontconfig_version}
 
-Patch0: cairo-1.1.2-embedded-bitmaps.patch
-Patch1: cairo-1.1.2-XRenderAddGlyphs-4705.patch
-
 %description 
 Cairo is a vector graphics library designed to provide high-quality
 display and print output. Currently supported output targets include
@@ -51,8 +48,6 @@ source vector graphics library.
 
 %prep
 %setup -q
-%patch0 -p1 -b .embedded-bitmaps
-%patch1 -p1 -b .XRenderAddGlyphs-4705
 
 %build
 %configure --enable-warnings --disable-glitz --disable-quartz \
@@ -87,6 +82,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Wed May  3 2006 Carl Worth <cworth@redhat.com> - 1.1.4-1
+- Update to new upstream 1.1.4
+- Drop both embedded-bitmaps and XRenderAddGlyphs patches as both now
+  have upstream versions
+
 * Fri Apr 28 2006 Carl Worth <cworth@redhat.com> - 1.1.2-2
 - Add suggested patch for XRenderAddGlyphs crash of bug #4705
   https://bugs.freedesktop.org/show_bug.cgi?id=4705
diff --git a/sources b/sources
index bf8c14f..53ed7f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa311ae12985a3ee75565cb002733022  cairo-1.1.2.tar.gz
+12f3eb59bf5e05b1868f2a09135c35be  cairo-1.1.4.tar.gz