From da605af93f0e26650c69bf612a856005d2e749e5 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Jan 16 2013 22:24:51 +0000
Subject: cairo 1.12.10


- 0001-xlib-shm-Fix-memory-leak.patch: Drop, merged.

---

diff --git a/.gitignore b/.gitignore
index 4d9855d..9b4ec02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ cairo-1.9.14.tar.gz
 /cairo-1.12.6.tar.xz
 /cairo-1.12.8.tar.gz
 /cairo-1.12.8.tar.xz
+/cairo-1.12.10.tar.xz
diff --git a/cairo.spec b/cairo.spec
index 371e33c..c935afd 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -4,8 +4,8 @@
 
 Summary:	A 2D graphics library
 Name:		cairo
-Version:	1.12.8
-Release:	3%{?dist}
+Version:	1.12.10
+Release:	1%{?dist}
 URL:		http://cairographics.org
 #VCS:		git:git://git.freedesktop.org/git/cairo
 #Source0:	http://cairographics.org/snapshots/%{name}-%{version}.tar.gz
@@ -15,7 +15,6 @@ Group:		System Environment/Libraries
 
 Patch0:		0001-xlib-Don-t-crash-when-swapping-a-0-sized-glyph.patch
 Patch1:		0002-xcb-Don-t-crash-when-swapping-a-0-sized-glyph.patch
-Patch2:		0001-xlib-shm-Fix-memory-leak.patch
 
 BuildRequires: pkgconfig
 BuildRequires: libXrender-devel
@@ -97,7 +96,6 @@ This package contains tools for working with the cairo graphics library.
 %setup -q
 %patch0 -p1 -b .xlib-swap
 %patch1 -p1 -b .xcb-swap
-%patch2 -p1 -b .shm-leak
 
 %build
 %configure --disable-static	\
@@ -181,6 +179,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/cairo/
 
 %changelog
+* Wed Jan 16 2013 Adam Jackson <ajax@redhat.com> 1.12.10-1
+- cairo 1.12.10
+- 0001-xlib-shm-Fix-memory-leak.patch: Drop, merged.
+
 * Wed Jan  2 2013 Matthias Clasen <mclasen@redhat.com> - 1.12.8-3
 - Make inter-subpackage deps explicit
 
diff --git a/sources b/sources
index 091570c..472932c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b3dcade859c44fb7e56fc68edfe9a45  cairo-1.12.8.tar.xz
+bddd5c5b734ab4b9683eb0ba363070d4  cairo-1.12.10.tar.xz