From 7d2f64f968d91a164dd5ec343f45593cde190235 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Feb 13 2016 20:59:27 +0000 Subject: Remove architecture specific test disablements --- diff --git a/nodejs-mapnik-failing-tests-otherarchs.patch b/nodejs-mapnik-failing-tests-otherarchs.patch deleted file mode 100644 index 2b7eecb..0000000 --- a/nodejs-mapnik-failing-tests-otherarchs.patch +++ /dev/null @@ -1,91 +0,0 @@ -commit d2478040025387e154b4e88bda87497deb3069eb -Author: Tom Hughes -Date: Sun Dec 6 12:29:48 2015 +0000 - - Disable some geometry comparisons on non-x86_64 platforms - -diff --git a/test/vector-tile.test.js b/test/vector-tile.test.js -index e5b36f8..5ead21f 100644 ---- a/test/vector-tile.test.js -+++ b/test/vector-tile.test.js -@@ -1851,7 +1851,7 @@ describe('mapnik.VectorTile ', function() { - map.render(vtile, {variables:{pizza:'pie'}}, function(err, vtile) { - if (err) throw err; - // This next tests that multipart layers work in toGeoJSON -- assert(Math.abs(485030 - vtile.toGeoJSON(0).length) < 50); -+// assert(Math.abs(485030 - vtile.toGeoJSON(0).length) < 50); - assert.equal(vtile.isSolid(), false); - if (hasBoostSimple) { - assert.equal(vtile.reportGeometrySimplicity().length, 0); -@@ -1869,7 +1869,7 @@ describe('mapnik.VectorTile ', function() { - vt1.setData(expected_data); - var vt2 = new mapnik.VectorTile(0,0,0); - vt2.setData(actual_data); -- assert.equal(JSON.stringify(vt1.toJSON({decode_geometry:true})),JSON.stringify(vt2.toJSON({decode_geometry:true}))); -+// assert.equal(JSON.stringify(vt1.toJSON({decode_geometry:true})),JSON.stringify(vt2.toJSON({decode_geometry:true}))); - done(); - }); - }); -@@ -1899,7 +1899,7 @@ describe('mapnik.VectorTile ', function() { - vt1.setData(expected_data); - var vt2 = new mapnik.VectorTile(0,0,0); - vt2.setData(actual_data); -- assert.equal(JSON.stringify(vt1.toJSON()),JSON.stringify(vt2.toJSON())); -+// assert.equal(JSON.stringify(vt1.toJSON()),JSON.stringify(vt2.toJSON())); - done(); - }); - }); -@@ -1931,7 +1931,7 @@ describe('mapnik.VectorTile ', function() { - vt1.setData(expected_data); - var vt2 = new mapnik.VectorTile(0,0,0); - vt2.setData(actual_data); -- assert.equal(JSON.stringify(vt1.toJSON()),JSON.stringify(vt2.toJSON())); -+// assert.equal(JSON.stringify(vt1.toJSON()),JSON.stringify(vt2.toJSON())); - done(); - }); - }); -@@ -1963,7 +1963,7 @@ describe('mapnik.VectorTile ', function() { - vt1.setData(expected_data); - var vt2 = new mapnik.VectorTile(0,0,0); - vt2.setData(actual_data); -- assert.equal(JSON.stringify(vt1.toJSON()),JSON.stringify(vt2.toJSON())); -+// assert.equal(JSON.stringify(vt1.toJSON()),JSON.stringify(vt2.toJSON())); - done(); - }); - }); -@@ -1995,7 +1995,7 @@ describe('mapnik.VectorTile ', function() { - vt1.setData(expected_data); - var vt2 = new mapnik.VectorTile(0,0,0); - vt2.setData(actual_data); -- assert.equal(JSON.stringify(vt1.toJSON()),JSON.stringify(vt2.toJSON())); -+// assert.equal(JSON.stringify(vt1.toJSON()),JSON.stringify(vt2.toJSON())); - done(); - }); - }); -@@ -2059,7 +2059,7 @@ describe('mapnik.VectorTile ', function() { - vt1.setData(expected_data); - var vt2 = new mapnik.VectorTile(0,0,0); - vt2.setData(actual_data); -- assert.equal(JSON.stringify(vt1.toJSON()),JSON.stringify(vt2.toJSON())); -+// assert.equal(JSON.stringify(vt1.toJSON()),JSON.stringify(vt2.toJSON())); - done(); - }); - }); -@@ -2091,7 +2091,7 @@ describe('mapnik.VectorTile ', function() { - vt1.setData(expected_data); - var vt2 = new mapnik.VectorTile(0,0,0); - vt2.setData(actual_data); -- assert.equal(JSON.stringify(vt1.toJSON()),JSON.stringify(vt2.toJSON())); -+// assert.equal(JSON.stringify(vt1.toJSON()),JSON.stringify(vt2.toJSON())); - done(); - }); - }); -@@ -2123,7 +2123,7 @@ describe('mapnik.VectorTile ', function() { - vt1.setData(expected_data); - var vt2 = new mapnik.VectorTile(0,0,0); - vt2.setData(actual_data); -- assert.equal(JSON.stringify(vt1.toJSON()),JSON.stringify(vt2.toJSON())); -+// assert.equal(JSON.stringify(vt1.toJSON()),JSON.stringify(vt2.toJSON())); - done(); - }); - }); diff --git a/nodejs-mapnik.spec b/nodejs-mapnik.spec index d454cba..2d176ef 100644 --- a/nodejs-mapnik.spec +++ b/nodejs-mapnik.spec @@ -1,6 +1,6 @@ Name: nodejs-mapnik Version: 3.4.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Bindings to Mapnik tile rendering library for Node.js License: BSD @@ -10,10 +10,8 @@ Source0: https://github.com/mapnik/node-mapnik/archive/%{version}/%{name} Patch0: nodejs-mapnik-pregyp.patch # Relax some tests (https://github.com/mapnik/node-mapnik/issues/569) Patch1: nodejs-mapnik-relax-tests.patch -# Disable some tests that fail on non-x86_64 platforms -Patch2: nodejs-mapnik-failing-tests-otherarchs.patch # https://github.com/mapnik/node-mapnik/pull/589 -Patch3: nodejs-mapnik-rgbtohsl.patch +Patch2: nodejs-mapnik-rgbtohsl.patch ExclusiveArch: %{nodejs_arches} @@ -50,13 +48,7 @@ BuildRequires: npm(nan) >= 2.2.0 %prep -%setup -q -n node-mapnik-%{version} -%patch0 -p1 -%patch1 -p1 -%ifnarch x86_64 -%patch2 -p1 -%endif -%patch3 -p1 +%autosetup -p 1 -n node-mapnik-%{version} %nodejs_fixdep --dev --move nan %nodejs_fixdep --dev --move mapnik-vector-tile rm -rf deps/protozero node_modules @@ -79,11 +71,9 @@ ln -s %{nodejs_sitelib}/mapnik/bin/mapnik-inspect.js %{buildroot}/%{_bindir}/ma %nodejs_symlink_deps -%ifnarch armv7hl %check %nodejs_symlink_deps --check %{nodejs_sitelib}/mocha/bin/mocha -R spec -t 5000 -%endif %files @@ -94,6 +84,9 @@ ln -s %{nodejs_sitelib}/mapnik/bin/mapnik-inspect.js %{buildroot}/%{_bindir}/ma %changelog +* Sat Feb 13 2016 Tom Hughes - 3.4.16-5 +- Remove architecture specific test disablements + * Wed Feb 10 2016 Tom Hughes - 3.4.16-4 - Rebuild for Node.js 4.3.x