From c700bd496bee56d8f0de03ef4d57a34d1a97bcf0 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 21 Sep 2010 07:31:18 -0400
Subject: [PATCH] Update to 1.8.10, rename to python-cairo.

---
 .gitignore   |  1 +
 pycairo.spec | 24 ++++++++++++++++++------
 sources      |  2 +-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 651016c..5018849 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pycairo-1.8.8.tar.gz
+/py2cairo-1.8.10.tar.gz
diff --git a/pycairo.spec b/pycairo.spec
index eeba29f..b27ba9d 100644
--- a/pycairo.spec
+++ b/pycairo.spec
@@ -1,19 +1,27 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# Last updated for 1.8.8
-%define cairo_version 1.8.6
+# Last updated for 1.8.10
+%define cairo_version 1.8.10
 
 ### Abstract ###
 
-Name: pycairo
-Version: 1.8.8
-Release: 2%{?dist}
+Name: python-cairo
+Version: 1.8.10
+Release: 1%{?dist}
 License: MPLv1.1 or LGPLv2
 Group: Development/Languages
 Summary: Python bindings for the cairo library
 URL: http://cairographics.org/pycairo
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Source: http://cairographics.org/releases/pycairo-%{version}.tar.gz
+Source: http://cairographics.org/releases/py2cairo-%{version}.tar.gz
+
+# With version 1.8.10, the upstream pycairo project began releasing multiple
+# tarballs for different Python versions: py2cairo for Python 2, and pycairo
+# for Python 3.  In order to provide a smooth upgrade path for users wishing
+# to stay on the Python 2 version, this package was renamed to python-cairo
+# and a python3-cairo package was introduced for Python 3.
+Provides: pycairo = %{version}
+Obsoletes: pycairo < 1.8.10
 
 ### Build Dependencies ###
 
@@ -63,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pycairo.pc
 
 %changelog
+* Tue Sep 21 2010 Matthew Barnes <mbarnes@redhat.com> - 1.8.10-1
+- Update to 1.8.10
+- Rename the package to python-cairo.
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 1.8.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/sources b/sources
index d5d9948..b92067c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-054da6c125cb427a003f5fd6c54f853e  pycairo-1.8.8.tar.gz
+87421a6a70304120555ba7ba238f3dc3  py2cairo-1.8.10.tar.gz