The package rpms/nodejs-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/nodejs-mapnik.git/commit/?id=e9b3....
Change:
+%ifarch aarch64 ppc64le
Thanks.
Full change:
============
commit e9b3e44f9f2e2f95c7699a4a809abbafea4f7d97
Author: Tom Hughes <tom(a)compton.nu>
Date: Wed Jun 14 08:26:17 2017 +0100
Update to 3.6.1 upstream release
diff --git a/.gitignore b/.gitignore
index 8128e02..04d3cfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@
/nodejs-mapnik-3.5.12.tar.gz
/nodejs-mapnik-3.5.14.tar.gz
/nodejs-mapnik-3.6.0.tar.gz
+/nodejs-mapnik-3.6.1.tar.gz
diff --git a/nodejs-mapnik-ppc64le.patch b/nodejs-mapnik-ppc64le.patch
deleted file mode 100644
index 9246336..0000000
--- a/nodejs-mapnik-ppc64le.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 45fec19ecf2ca5fcf1475cf46daa355ef01de9bf
-Author: Tom Hughes <tom(a)compton.nu>
-Date: Fri Dec 23 17:26:41 2016 +0000
-
- Disable some tests that are failing on ppc64le
-
-diff --git a/test/vector-tile.test.js b/test/vector-tile.test.js
-index d84778d..d269d86 100644
---- a/test/vector-tile.test.js
-+++ b/test/vector-tile.test.js
-@@ -2186,7 +2186,7 @@ describe('mapnik.VectorTile ', function() {
- map.render(vtile, opts, function(err, vtile) {
- if (err) throw err;
- if (hasBoostSimple) {
-- assert.equal(vtile.reportGeometrySimplicity().length, 0);
-+// assert.equal(vtile.reportGeometrySimplicity().length, 0);
- assert.equal(vtile.reportGeometryValidity().length, 25); // Dataset not
expected to be OGC valid
-
assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
- }
-@@ -2224,7 +2224,7 @@ describe('mapnik.VectorTile ', function() {
- map.render(vtile, opts, function(err, vtile) {
- if (err) throw err;
- if (hasBoostSimple) {
-- assert.equal(vtile.reportGeometrySimplicity().length, 0);
-+// assert.equal(vtile.reportGeometrySimplicity().length, 0);
- assert.equal(vtile.reportGeometryValidity().length, 25); // Dataset not
expected to be OGC valid
-
assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
- }
-@@ -3516,7 +3516,7 @@ describe('mapnik.VectorTile ', function() {
- 'landcover', 'hillshade',
'contour']);
- assert.equal(vtile.reportGeometryValidity().length, 0);
-
assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
-- assert.equal(vtile.reportGeometrySimplicity().length, 4);
-+// assert.equal(vtile.reportGeometrySimplicity().length, 4);
- done();
- });
- });
diff --git a/nodejs-mapnik-pregyp.patch b/nodejs-mapnik-pregyp.patch
index dc4e797..f9c5196 100644
--- a/nodejs-mapnik-pregyp.patch
+++ b/nodejs-mapnik-pregyp.patch
@@ -1,4 +1,4 @@
-commit e2066a891fe3e5915efafd5831a421b9e961c97f
+commit 3134ffa7425ab147bf956734e538f888c545cc7d
Author: Tom Hughes <tom(a)compton.nu>
Date: Mon Aug 18 14:30:51 2014 +0100
@@ -52,12 +52,12 @@ index 4cbb721..ef64c92 100644
var settings = require(settings_path);
diff --git a/package.json b/package.json
-index 208f920..c498970 100644
+index 522ce65..21d49bd 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,7 @@
"dependencies": {
- "mapnik-vector-tile": "1.3.0",
+ "mapnik-vector-tile": "1.4.0",
"protozero": "1.5.1",
- "nan": "~2.5.0",
- "node-pre-gyp": "~0.6.30"
diff --git a/nodejs-mapnik.spec b/nodejs-mapnik.spec
index deaf549..e4503a4 100644
--- a/nodejs-mapnik.spec
+++ b/nodejs-mapnik.spec
@@ -1,10 +1,10 @@
-%global mapnik_version 3.0.13
-%global mapnik_vector_tile_version 1.3.0
+%global mapnik_version 3.0.14
+%global mapnik_vector_tile_version 1.4.0
%global protozero_version 1.5.1
Name: nodejs-mapnik
-Version: 3.6.0
-Release: 2%{?dist}
+Version: 3.6.1
+Release: 1%{?dist}
Summary: Bindings to Mapnik tile rendering library for Node.js
License: BSD
@@ -16,10 +16,8 @@ Patch0: nodejs-mapnik-pregyp.patch
Patch1: nodejs-mapnik-system-libraries.patch
# Relax some tests (
https://github.com/mapnik/node-mapnik/issues/569)
Patch2: nodejs-mapnik-relax-tests.patch
-# Disable some tests that are failing on ppc64le
-Patch3: nodejs-mapnik-ppc64le.patch
# Use modules from the global namespace
-Patch4: nodejs-mapnik-global-namespace.patch
+Patch3: nodejs-mapnik-global-namespace.patch
ExclusiveArch: %{nodejs_arches}
@@ -73,7 +71,7 @@ echo '{}' > common.gypi
%build
%nodejs_symlink_deps --build
ls -l node_modules
-%ifarch aarch64
+%ifarch aarch64 ppc64le
export CXXFLAGS="%{optflags} -O1"
%else
export CXXFLAGS="%{optflags}"
@@ -105,6 +103,9 @@ ln -s %{nodejs_sitelib}/mapnik/bin/mapnik-inspect.js
%{buildroot}/%{_bindir}/ma
%changelog
+* Wed Jun 14 2017 Tom Hughes <tom(a)compton.nu> - 3.6.1-1
+- Update to 3.6.1 upstream release
+
* Mon May 15 2017 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.6.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
diff --git a/sources b/sources
index 0029249..7555367 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nodejs-mapnik-3.6.0.tar.gz) =
d8749160c3bc7727b2428bc9027495f09b6db3ae71a80d11c6cadf1b48a9711726657465c037a4a98ec291cdf0c2eea8d0ae7c4847115e6f254236620719d09c
+SHA512 (nodejs-mapnik-3.6.1.tar.gz) =
e6567dbc3fc53eecd909ef69804e6ac786d049e2dc8fedde26a57427a9ec67d06c0708ae625d721806c36423817f0b6d0c0e5aa3cc6485083274b957244a890e