From f55ba1f6a55bd19a96d218c72d7af5a3cc6e0eb4 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Jun 20 2017 07:46:37 +0000 Subject: Add a patch to fix an upstream test failure --- diff --git a/python-mapnik-tiled.patch b/python-mapnik-tiled.patch new file mode 100644 index 0000000..4b34c69 --- /dev/null +++ b/python-mapnik-tiled.patch @@ -0,0 +1,21 @@ +commit 500558ca54285986b360a69241e5a7adcde7be11 +Author: Tom Hughes +Date: Tue Jun 20 08:45:04 2017 +0100 + + Make test_tiff_rgba8_compare_tiled use a unique temporary file + + Fixes #152 + +diff --git a/test/python_tests/image_tiff_test.py b/test/python_tests/image_tiff_test.py +index a924b27..b1915c1 100644 +--- a/test/python_tests/image_tiff_test.py ++++ b/test/python_tests/image_tiff_test.py +@@ -256,7 +256,7 @@ def test_tiff_rgba8_compare_stripped(): + + def test_tiff_rgba8_compare_tiled(): + filepath1 = '../data/tiff/ndvi_256x256_rgba8_striped.tif' +- filepath2 = '/tmp/mapnik-tiff-rgba8-stripped.tiff' ++ filepath2 = '/tmp/mapnik-tiff-rgba8-tiled.tiff' + im = mapnik.Image.open(filepath1) + im.save(filepath2, 'tiff:method=tiled') + im2 = mapnik.Image.open(filepath2) diff --git a/python-mapnik.spec b/python-mapnik.spec index 4547cb5..612bc18 100644 --- a/python-mapnik.spec +++ b/python-mapnik.spec @@ -8,7 +8,7 @@ Name: python-%{srcname} Version: 0.1 -Release: 18.20170614git%{shortcommit}%{?dist} +Release: 19.20170614git%{shortcommit}%{?dist} Summary: Python bindings for Mapnik License: LGPLv2+ @@ -24,6 +24,9 @@ Patch1: python-mapnik-precision.patch Patch2: python-mapnik-gdal.patch # Disable some tests that are failing on certain arches Patch3: python-mapnik-pgraster.patch +# https://github.com/mapnik/python-mapnik/issues/152 +# https://github.com/mapnik/python-mapnik/pull/153 +Patch4: python-mapnik-tiled.patch # Exclude big endian architectures as mapnik does not support them # https://github.com/mapnik/mapnik/issues/2313 @@ -71,6 +74,7 @@ Summary: %{summary} %ifarch armv7hl aarch64 ppc64le %patch3 -p1 %endif +%patch4 -p1 tar --directory=test/data --strip-components=1 --gunzip --extract --file=%{SOURCE1} tar --directory=test/data-visual --strip-components=1 --gunzip --extract --file=%{SOURCE2} @@ -117,6 +121,9 @@ pg_ctl stop -D pg_data %changelog +* Fri Jun 16 2017 Tom Hughes - 0.1-19.20170614git1635afe +- Rebuild against mapnik 3.0.15 + * Wed Jun 14 2017 Tom Hughes - 0.1-18.20170614git1635afe - Update to new snapshot - Rebuild against mapnik 3.0.14