[python-shapely] NEW UPSTREAM RELEASE 1.2.15

[Volker Fröhlich]

commit dd1f1c014923c781e1f54a19b3a9ee4302b30c5e
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Fri Jun 29 08:31:34 2012 +0200

    NEW UPSTREAM RELEASE 1.2.15
    
    - Drop chaintest patch
    - Pyx file is no longer shipped, so no C code can be generated with
      Cython

 .gitignore                                |    1 +
 python-shapely-1.2.12-re-run_cython.patch |   20 --------------------
 python-shapely-1.2.14-chaintest.patch     |   17 -----------------
 python-shapely.spec                       |   29 +++++++----------------------
 sources                                   |    2 +-
 5 files changed, 9 insertions(+), 60 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f36275..d6532b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /Shapely-1.2.12.tar.gz
 /Shapely-1.2.13.tar.gz
 /Shapely-1.2.14.tar.gz
+/Shapely-1.2.15.tar.gz
diff --git a/python-shapely.spec b/python-shapely.spec
index 4955e59..8d663aa 100644
--- a/python-shapely.spec
+++ b/python-shapely.spec
@@ -1,5 +1,5 @@
 Name:           python-shapely
-Version:        1.2.14
+Version:        1.2.15
 Release:        1%{?dist}
 Summary:        Geometric objects, predicates, and operations
 
@@ -8,21 +8,9 @@ License:        BSD
 URL:            http://trac.gispython.org/lab/wiki/Shapely
 Source0:        http://pypi.python.org/packages/source/S/Shapely/Shapely-%{version}.tar.gz
 
-# Taken from Debian:
-# Description: Generate .pyx at compile time.
-# Shapely is distributed with the .pyx Cython file already transformed into a .c
-# file. This patch imports the modified "build_ext" from the Cython Distutils,
-# and then feeds it the .pyx (rather than .c) file.
-# http://archive.ubuntu.com/ubuntu/pool/universe/p/python-shapely/python-shapely_1.2.10-1ubuntu1.debian.tar.gz
-Patch0:         %{name}-1.2.12-re-run_cython.patch
-
-# Upstream correction for attribute chaining test
-Patch1:         %{name}-1.2.14-chaintest.patch
-
-# Debian also has a patch on a locale test. Since this patch doesn't fail
+# Debian also has a patch on a locale test. Since this test doesn't fail
 # on our build systems, there's no need to patch it.
 
-BuildRequires:  Cython
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 BuildRequires:  geos-devel
@@ -50,17 +38,9 @@ See README.rst for more information!
 %prep
 %setup -q -n Shapely-%{version}
 
-#TODO: Upstream
-%patch0 -p1 -b .cython~
-%patch1 -p1 -b .chaintest~
-
-rm -f shapely/speedups/_speedups.c
-
 
 %build
 %{__python} setup.py build
-# TODO: Revisit Cython debugging
-# http://docs.cython.org/src/userguide/debugging.html
 
 
 %check
@@ -84,6 +64,11 @@ rm -f shapely/speedups/_speedups.c
 
 
 %changelog
+* Thu Jun 28 2012 Volker Fröhlich <volker27 at gmx.at> - 1.2.15-1
+- New upstream release
+- Pyx file is no longer part of the sources, thus Cython is no longer BR
+- Chaintest is working fine now, drop the patch
+
 * Sun Apr  8 2012 Volker Fröhlich <volker27 at gmx.at> - 1.2.14-1
 - Update for release 1.2.14
 - Remove duplicate PKG-INFO file
diff --git a/sources b/sources
index a6748f5..8ff1566 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be8efc68e83b3db086ec092a835ae4e5  Shapely-1.2.14.tar.gz
+abe35e49f7fafe7e2ab6f6bb33c1ff2c  Shapely-1.2.15.tar.gz