[nodejs-mapnik] Update to 1.3.1 upstream release
Tom Hughes
tomh at fedoraproject.org
Tue Feb 25 20:53:56 UTC 2014
commit ffdc4a21ab77b3bbcb1303bb3b1c922ff8108b90
Author: Tom Hughes <tom at compton.nu>
Date: Sat Feb 22 00:12:58 2014 +0000
Update to 1.3.1 upstream release
.gitignore | 1 +
nodejs-mapnik-build.patch | 46 -----------------------------------------
nodejs-mapnik-precision.patch | 40 ++++++++++++++++++++++-------------
nodejs-mapnik.spec | 18 ++++++++--------
sources | 2 +-
5 files changed, 36 insertions(+), 71 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 547b998..f497abe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/mapnik-1.2.2.tgz
/mapnik-1.2.3.tgz
/mapnik-1.3.0.tgz
+/mapnik-1.3.1.tgz
diff --git a/nodejs-mapnik-precision.patch b/nodejs-mapnik-precision.patch
index 24820f3..c3c5d13 100644
--- a/nodejs-mapnik-precision.patch
+++ b/nodejs-mapnik-precision.patch
@@ -1,32 +1,38 @@
-commit 8b279c1d8ff74df7b6ab39f8bf520223fa73507d
+commit 6809ef65bc2e7b437a86ceebd99a91d37cb9e7c0
Author: Tom Hughes <tom at compton.nu>
Date: Tue Jul 30 18:39:30 2013 +0100
Work around precision issues in test/vector-tile.test.js
diff --git a/test/vector-tile.test.js b/test/vector-tile.test.js
-index 401e1dd..5522528 100644
+index c2622dd..9b4f8b1 100644
--- a/test/vector-tile.test.js
+++ b/test/vector-tile.test.js
-@@ -346,7 +346,7 @@ describe('mapnik.VectorTile ', function() {
+@@ -350,7 +350,9 @@ describe('mapnik.VectorTile ', function() {
var actual = './test/data/vector_tile/tile0.actual.png';
var expected = './test/data/vector_tile/tile0.expected.png';
vtile_image.save(actual, 'png32');
- assert.equal(fs.readFileSync(actual).length,fs.readFileSync(expected).length);
-+// assert.equal(fs.readFileSync(actual).length,fs.readFileSync(expected).length);
++ var a = fs.readFileSync(actual);
++ var e = fs.readFileSync(expected)
++ assert.ok(Math.abs(e.length - a.length) < 100);
done();
});
});
-@@ -366,7 +366,7 @@ describe('mapnik.VectorTile ', function() {
- var actual = './test/data/vector_tile/tile0-b.actual.png';
- var expected = './test/data/vector_tile/tile0-b.expected.png';
+@@ -372,11 +374,7 @@ describe('mapnik.VectorTile ', function() {
vtile_image.save(actual, 'png32');
-- assert.equal(fs.readFileSync(actual).length,fs.readFileSync(expected).length);
-+// assert.equal(fs.readFileSync(actual).length,fs.readFileSync(expected).length);
+ var a = fs.readFileSync(actual);
+ var e = fs.readFileSync(expected)
+- if (mapnik.versions.mapnik_number >= 300000) {
+- assert.ok(Math.abs(e.length - a.length) < 100);
+- } else {
+- assert.equal(e.length,a.length);
+- }
++ assert.ok(Math.abs(e.length - a.length) < 100);
done();
});
});
-@@ -391,7 +391,7 @@ describe('mapnik.VectorTile ', function() {
+@@ -401,7 +399,7 @@ describe('mapnik.VectorTile ', function() {
}
fs.writeFileSync(actual_file,JSON.stringify(utf,null,1));
var expected = JSON.parse(fs.readFileSync(expected_file));
@@ -35,12 +41,16 @@ index 401e1dd..5522528 100644
done();
});
});
-@@ -453,7 +453,7 @@ describe('mapnik.VectorTile ', function() {
- vtile_image.save(expected, 'png32');
- }
+@@ -465,11 +463,7 @@ describe('mapnik.VectorTile ', function() {
vtile_image.save(actual, 'png32');
-- assert.equal(fs.readFileSync(actual).length,fs.readFileSync(expected).length);
-+// assert.equal(fs.readFileSync(actual).length,fs.readFileSync(expected).length);
+ var a = fs.readFileSync(actual);
+ var e = fs.readFileSync(expected)
+- if (mapnik.versions.mapnik_number >= 300000) {
+- assert.ok(Math.abs(e.length - a.length) < 200);
+- } else {
+- assert.equal(e.length,a.length);
+- }
++ assert.ok(Math.abs(e.length - a.length) < 200);
done();
});
});
diff --git a/nodejs-mapnik.spec b/nodejs-mapnik.spec
index db320c7..c900aea 100644
--- a/nodejs-mapnik.spec
+++ b/nodejs-mapnik.spec
@@ -1,21 +1,19 @@
Name: nodejs-mapnik
-Version: 1.3.0
+Version: 1.3.1
Release: 1%{?dist}
Summary: Bindings to Mapnik tile rendering library for Node.js
License: BSD
URL: https://github.com/mapnik/node-mapnik
Source0: http://registry.npmjs.org/mapnik/-/mapnik-%{version}.tgz
-# Don't try and build mapnik-vector-tile
-Patch0: nodejs-mapnik-build.patch
# Reported upstream - https://github.com/mapnik/node-mapnik/issues/163
-Patch1: nodejs-mapnik-color.patch
+Patch0: nodejs-mapnik-color.patch
# Correct system font paths
-Patch2: nodejs-mapnik-fonts.patch
+Patch1: nodejs-mapnik-fonts.patch
# Reported upstream - https://github.com/mapnik/node-mapnik/issues/170
-Patch3: nodejs-mapnik-precision.patch
+Patch2: nodejs-mapnik-precision.patch
# Disable HSV support - not supported in Fedora mapnik build
-Patch4: nodejs-mapnik-hsv.patch
+Patch3: nodejs-mapnik-hsv.patch
ExclusiveArch: %{nodejs_arches}
BuildRequires: nodejs-devel
@@ -29,7 +27,7 @@ BuildRequires: cairo-devel
BuildRequires: polyclipping-devel
BuildRequires: protobuf-lite-devel
BuildRequires: libtool-ltdl-devel
-BuildRequires: npm(mapnik-vector-tile) >= 0.4.0
+BuildRequires: npm(mapnik-vector-tile) >= 0.4.1
BuildRequires: npm(npm)
BuildRequires: npm(mocha)
@@ -47,7 +45,6 @@ BuildRequires: npm(sphericalmercator)
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
rm -rf node_modules
echo '{}' > common.gypi
%nodejs_symlink_deps --check
@@ -79,6 +76,9 @@ ln -s %{nodejs_sitelib}/mapnik/bin/mapnik-render.js %{buildroot}/%{_bindir}/map
%changelog
+* Sat Feb 22 2014 Tom Hughes <tom at compton.nu> - 1.3.1-1
+- Update to 1.3.1 upstream release
+
* Wed Feb 19 2014 Tom Hughes <tom at compton.nu> - 1.3.0-1
- Update to 1.3.0 upstream release
diff --git a/sources b/sources
index e08059c..1212811 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-00bd55f52a9d283b5ee4ea6d5861738a mapnik-1.3.0.tgz
+cf24d3bc197a42d0b40dfa9287cfcff8 mapnik-1.3.1.tgz
More information about the scm-commits
mailing list