Revert illegal package rename so it properly builds, spec file cleanup

pycairo.spec

@@ -1,31 +1,15 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# Last updated for 1.8.10
-%define cairo_version 1.8.10
-
-### Abstract ###
-
-Name: python-cairo
+Name: pycairo
 Version: 1.8.10
-Release: 3%{?dist}
+Release: 4%{?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/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 ###
-
-BuildRequires: cairo-devel >= %{cairo_version}
+BuildRequires: cairo-devel
 BuildRequires: pkgconfig
 BuildRequires: python-devel
 
@@ -45,7 +29,7 @@ This package contains files required to build wrappers for cairo add-on
 libraries so that they interoperate with pycairo.
 
 %prep
-%setup -q -n pycairo-%{version}
+%setup -q
 
 %build
 %configure
@@ -67,6 +51,10 @@ find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
 %{_libdir}/pkgconfig/pycairo.pc
 
 %changelog
+* Sun Feb 19 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.8.10-4
+- Revert illegal package rename so it properly builds
+- spec file cleanup
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
@@ -162,4 +150,3 @@ find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
 
 * Wed Nov 24 2004  <jrb@redhat.com> - 
 - Initial build.
-