The package rpms/python-mapnik.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/python-mapnik.git/commit/?id=17a0....
Change:
+%ifnarch %{ix86}
Thanks.
Full change:
============
commit 17a0151050f69130cb120d05933ad9dae0dc5ade
Author: Tom Hughes <tom(a)compton.nu>
Date: Thu Jun 15 11:21:24 2017 +0100
Disable tests on x86 as postgres and/or postgis seem to be crashing
diff --git a/python-mapnik.spec b/python-mapnik.spec
index 2507d76..4547cb5 100644
--- a/python-mapnik.spec
+++ b/python-mapnik.spec
@@ -87,6 +87,7 @@ export PYCAIRO=true
%check
+%ifnarch %{ix86}
# start a postgres instance for the tests to use
pg_ctl initdb -D pg_data -o "-A ident -E utf8"
pg_ctl start -w -D pg_data -l pg_log -o "-h '' -k $PWD"
@@ -98,6 +99,7 @@ rm test/python_tests/pdf_printing_test.py
PGHOST="$PWD" LANG="en_US.utf8" %{__python3} setup.py test
# stop the postgres instance
pg_ctl stop -D pg_data
+%endif
%files -n python2-%{srcname}
commit 3f8e96fe19b8753c2e1c5cff03113a933c441af9
Author: Tom Hughes <tom(a)compton.nu>
Date: Wed Jun 14 15:58:24 2017 +0100
Update to new snapshot and rebuild against mapnik 3.0.14
diff --git a/.gitignore b/.gitignore
index 1c2acee..838196d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/python-mapnik-ed2f6ef766881b13c7fc36ef70883ead25471aad.tar.gz
/test-data-visual-941db3d00920dc7aceaa6797096a7228bc7bac14.tar.gz
/python-mapnik-8139e5c7aebc2b555f991fc32f6190a1db1cf405.tar.gz
+/python-mapnik-1635afe2359a0984868a47857645459c0fce44e3.tar.gz
diff --git a/python-mapnik-featureset.patch b/python-mapnik-featureset.patch
deleted file mode 100644
index ec13625..0000000
--- a/python-mapnik-featureset.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit e16986fc815c6e9b75672e0e137c018942aef0ad
-Author: Tom Hughes <tom(a)compton.nu>
-Date: Sat Sep 10 19:51:36 2016 +0100
-
- Update tests for Featureset iterator changes in 76c73ef0
-
-diff --git a/test/python_tests/postgis_test.py b/test/python_tests/postgis_test.py
-index bafda20..62077ff 100644
---- a/test/python_tests/postgis_test.py
-+++ b/test/python_tests/postgis_test.py
-@@ -729,7 +729,7 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
- max_size=20,
- geometry_field='geom')
- fs = ds.all_features()
-- eq_(len(fs), 8)
-+ eq_(len(list(fs)), 8)
-
- meta = ds.describe()
- eq_(meta['srid'], 4326)
-@@ -967,7 +967,7 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
- failed = False
- try:
- fs = ds_bad.featureset()
-- for feature in fs.features:
-+ for feature in fs:
- pass
- except RuntimeError as e:
- assert 'invalid input syntax for integer' in str(e)
-@@ -978,7 +978,7 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
- # Should be ok
- fs = ds_good.featureset()
- count = 0
-- for feature in fs.features:
-+ for feature in fs:
- count += 1
- eq_(count, 8)
-
diff --git a/python-mapnik-geojson.patch b/python-mapnik-geojson.patch
deleted file mode 100644
index a299149..0000000
--- a/python-mapnik-geojson.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 8482393044fa974688a50cd64a84686f428d6a3c
-Author: Tom Hughes <tom(a)compton.nu>
-Date: Tue Feb 14 19:48:25 2017 +0000
-
- Patch out failing geojson test
-
-diff --git a/test/python_tests/geometry_io_test.py
b/test/python_tests/geometry_io_test.py
-index e51686c..fbc6f8f 100644
---- a/test/python_tests/geometry_io_test.py
-+++ b/test/python_tests/geometry_io_test.py
-@@ -115,7 +115,6 @@ geojson_nulls = [
- '{ "type": "Feature", "properties": { },
"geometry": { "type": "MultiLineString",
"coordinates": [ [ [] ] ] }}',
- '{ "type": "Feature", "properties": { },
"geometry": { "type": "MultiPolygon",
"coordinates": [ [] ] }}',
- '{ "type": "Feature", "properties": { },
"geometry": { "type": "MultiPolygon",
"coordinates": [ [ [] ] ] }}',
-- '{ "type": "Feature", "properties": { },
"geometry": { "type": "MultiPolygon",
"coordinates": [ [ [ [] ] ] ] }}',
- ]
-
- # valid, but empty wkb's
diff --git a/python-mapnik-precision.patch b/python-mapnik-precision.patch
index ee81cb6..76e2df2 100644
--- a/python-mapnik-precision.patch
+++ b/python-mapnik-precision.patch
@@ -1,4 +1,4 @@
-commit bfb73acb98c82986628288475fcde0c60ce7aa58
+commit 4c018c9fcaebf9ba365494925131e8a285b68834
Author: Tom Hughes <tom(a)compton.nu>
Date: Mon Nov 23 12:12:32 2015 +0000
@@ -90,10 +90,10 @@ index 47c71a6..2bcc8b8 100644
compared.save(diff)
assert False, 'images do not match, check diff at %s' % diff
diff --git a/test/python_tests/raster_symbolizer_test.py
b/test/python_tests/raster_symbolizer_test.py
-index caebaab..24573f0 100644
+index caebaab..7e02de2 100644
--- a/test/python_tests/raster_symbolizer_test.py
+++ b/test/python_tests/raster_symbolizer_test.py
-@@ -191,8 +191,7 @@ def test_raster_warping():
+@@ -65,8 +65,7 @@ def test_dataraster_coloring():
im.save(expected_file, 'png32')
actual = mapnik.Image.open(actual_file)
expected = mapnik.Image.open(expected_file)
@@ -103,7 +103,17 @@ index caebaab..24573f0 100644
'failed comparing actual (%s) and expected (%s)' % (actual_file,
expected_file))
-@@ -229,8 +228,7 @@ def test_raster_warping_does_not_overclip_source():
+@@ -191,8 +190,7 @@ def test_raster_warping():
+ im.save(expected_file, 'png32')
+ actual = mapnik.Image.open(actual_file)
+ expected = mapnik.Image.open(expected_file)
+- eq_(actual.tostring('png32'),
+- expected.tostring('png32'),
++ eq_(actual.compare(expected, 500), 0,
+ 'failed comparing actual (%s) and expected (%s)' % (actual_file,
+ expected_file))
+
+@@ -229,8 +227,7 @@ def test_raster_warping_does_not_overclip_source():
im.save(expected_file, 'png32')
actual = mapnik.Image.open(actual_file)
expected = mapnik.Image.open(expected_file)
@@ -114,7 +124,7 @@ index caebaab..24573f0 100644
expected_file))
diff --git a/test/python_tests/render_test.py b/test/python_tests/render_test.py
-index 42f63f2..810d6e6 100644
+index 42f63f2..bc638c3 100644
--- a/test/python_tests/render_test.py
+++ b/test/python_tests/render_test.py
@@ -279,8 +279,7 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
@@ -123,7 +133,7 @@ index 42f63f2..810d6e6 100644
expected = mapnik.Image.open(expected_file)
- eq_(actual.tostring('png32'),
- expected.tostring('png32'),
-+ eq_(actual.compare(expected, 20), 0,
++ eq_(actual.compare(expected, 500), 0,
'failed comparing actual (%s) and expected (%s)' %
(actual_file,
expected_file))
diff --git a/python-mapnik.spec b/python-mapnik.spec
index 8de14d5..2507d76 100644
--- a/python-mapnik.spec
+++ b/python-mapnik.spec
@@ -1,6 +1,6 @@
%global srcname mapnik
-%global commit 8139e5c7aebc2b555f991fc32f6190a1db1cf405
+%global commit 1635afe2359a0984868a47857645459c0fce44e3
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global testcommit 6ce59adfc4f11b16a5dc0e2020c36dc614850989
@@ -8,7 +8,7 @@
Name: python-%{srcname}
Version: 0.1
-Release: 17.20170214git%{shortcommit}%{?dist}
+Release: 18.20170614git%{shortcommit}%{?dist}
Summary: Python bindings for Mapnik
License: LGPLv2+
@@ -22,12 +22,8 @@ Patch0: python-mapnik-flags.patch
Patch1: python-mapnik-precision.patch
# Remove test that relies on WKT data missing from Fedora's gdal
Patch2: python-mapnik-gdal.patch
-#
https://github.com/mapnik/python-mapnik/pull/109
-Patch3: python-mapnik-featureset.patch
-#
https://github.com/mapnik/python-mapnik/issues/139
-Patch4: python-mapnik-geojson.patch
# Disable some tests that are failing on certain arches
-Patch5: python-mapnik-pgraster.patch
+Patch3: python-mapnik-pgraster.patch
# Exclude big endian architectures as mapnik does not support them
#
https://github.com/mapnik/mapnik/issues/2313
@@ -72,10 +68,8 @@ Summary: %{summary}
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%ifarch armv7hl aarch64 ppc64le
-%patch5 -p1
+%patch3 -p1
%endif
tar --directory=test/data --strip-components=1 --gunzip --extract --file=%{SOURCE1}
tar --directory=test/data-visual --strip-components=1 --gunzip --extract
--file=%{SOURCE2}
@@ -121,6 +115,10 @@ pg_ctl stop -D pg_data
%changelog
+* Wed Jun 14 2017 Tom Hughes <tom(a)compton.nu> - 0.1-18.20170614git1635afe
+- Update to new snapshot
+- Rebuild against mapnik 3.0.14
+
* Mon May 15 2017 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.1-17.20170214git8139e5c
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
diff --git a/sources b/sources
index 2e95d5c..366e4e6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (python-mapnik-8139e5c7aebc2b555f991fc32f6190a1db1cf405.tar.gz) =
1b7a21ce61546492b95e48a5c5102ad276fe35ad19e20295c7b54cd07e3df127c93b0046ef0a6c793b2e2b502298d4c47ee12f0be233ad71472474a2cf995304
+SHA512 (python-mapnik-1635afe2359a0984868a47857645459c0fce44e3.tar.gz) =
cedb748c525fea45b9f938fa4cda726817d3276d41c19a305713a75dd4d6e4808cb7fc467ef728bf69b0239cf60b10c2f63ca09967fa2416e04154ee4a70936f
SHA512 (test-data-6ce59adfc4f11b16a5dc0e2020c36dc614850989.tar.gz) =
901d95f14473a2567d3593da8bac9fcdadfb876ab71d20751e35b7b03b1eb3f7c0cca2ca0de937a2fb45b7a8fe066310f9b3f6da6616817778851df65f49742a
SHA512 (test-data-visual-941db3d00920dc7aceaa6797096a7228bc7bac14.tar.gz) =
2ad1d9a1e8e04e379dfddda6c315c05d71e2d30185567beea2bce50b7df030b609c68c2110b7e88f39f84f9df80b42e131507a203ce8307df293db68a5f92980