From 8bd90c8635bb8181346ab5a0583567cc164f2b54 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Mar 15 2006 19:26:01 +0000
Subject: 1.0.4


---

diff --git a/.cvsignore b/.cvsignore
index ef1a00b..dc3ca66 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 cairo-1.0.2.tar.gz
+cairo-1.0.4.tar.gz
diff --git a/cairo.spec b/cairo.spec
index 66fb7a2..8b5ff00 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -24,8 +24,6 @@ BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: fontconfig-devel >= %{fontconfig_version}
 
 Patch0: cairo-1.0.2-embedded-bitmaps.patch
-Patch1: cairo-1.0.2-fix-build.patch
-Patch2: cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch
 
 %description 
 Cairo is a vector graphics library designed to provide high-quality
@@ -53,8 +51,6 @@ source vector graphics library.
 %prep
 %setup -q
 %patch0 -p1 -b .embedded-bitmaps
-%patch1 -p1 -b .fix-build
-%patch2 -p1 -b .chunk-glyphs-CVS-2006-0528
 
 %build
 %configure --enable-warnings --disable-glitz --disable-quartz \
@@ -91,6 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Mar 15 2006 Matthias Clasen <mclasen@redhat.com> - 1.0.4-1
 - Update to 1.0.4
+- Drop upstreamed patches
 
 * Fri Mar  3 2006 Carl Worth <cworth@redhat.com> - 1.0.2-5
 - add patch to chunk Xlib glyph compositing (bug 182416 and
diff --git a/sources b/sources
index c242555..120cbbe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0b7111a14f90ec3afa777ec40c44984  cairo-1.0.2.tar.gz
+9002b0e69b3f94831a22d3f2a7735ce2  cairo-1.0.4.tar.gz