[nodejs-mapnik] Update to 1.4.2 upstream release

[Tom Hughes]

commit 4674f8f032ea82385f6a8678d4d0fd0962b1578b
Author: Tom Hughes <tom at compton.nu>
Date:   Thu Apr 3 12:21:04 2014 +0100

    Update to 1.4.2 upstream release

 .gitignore                    |    1 +
 nodejs-mapnik-fonts.patch     |   21 --------------------
 nodejs-mapnik-precision.patch |   43 ++--------------------------------------
 nodejs-mapnik.spec            |   19 ++++++++---------
 sources                       |    2 +-
 5 files changed, 14 insertions(+), 72 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 897f673..482a0f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /mapnik-1.3.4.tgz
 /mapnik-1.4.0.tgz
 /nodejs-mapnik-1.4.0-9ca8720.tar.gz
+/node-mapnik-549e90e01cdb071abe4db3ba512036928241079d.tar.gz
diff --git a/nodejs-mapnik-precision.patch b/nodejs-mapnik-precision.patch
index c3c5d13..ed1df26 100644
--- a/nodejs-mapnik-precision.patch
+++ b/nodejs-mapnik-precision.patch
@@ -1,38 +1,14 @@
-commit 6809ef65bc2e7b437a86ceebd99a91d37cb9e7c0
+commit 9e2efef8d49176fb9626e2db458039318d20fb92
 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 c2622dd..9b4f8b1 100644
+index 062ae36..0fe1d39 100644
 --- a/test/vector-tile.test.js
 +++ b/test/vector-tile.test.js
-@@ -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);
-+            var a = fs.readFileSync(actual);
-+            var e = fs.readFileSync(expected)
-+            assert.ok(Math.abs(e.length - a.length) < 100);
-             done();
-         });
-     });
-@@ -372,11 +374,7 @@ describe('mapnik.VectorTile ', function() {
-             vtile_image.save(actual, 'png32');
-             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();
-         });
-     });
-@@ -401,7 +399,7 @@ describe('mapnik.VectorTile ', function() {
+@@ -413,7 +413,7 @@ describe('mapnik.VectorTile ', function() {
              }
              fs.writeFileSync(actual_file,JSON.stringify(utf,null,1));
              var expected = JSON.parse(fs.readFileSync(expected_file));
@@ -41,16 +17,3 @@ index c2622dd..9b4f8b1 100644
              done();
          });
      });
-@@ -465,11 +463,7 @@ describe('mapnik.VectorTile ', function() {
-             vtile_image.save(actual, 'png32');
-             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 06584cb..3c8f007 100644
--- a/nodejs-mapnik.spec
+++ b/nodejs-mapnik.spec
@@ -1,22 +1,19 @@
-%global commit 9ca8720fb33f7eb5f34afaa01e8cd55600c82502
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit 549e90e01cdb071abe4db3ba512036928241079d
 
 Name:           nodejs-mapnik
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.4.2
+Release:        1%{?dist}
 Summary:        Bindings to Mapnik tile rendering library for Node.js
 
 License:        BSD
 URL:            https://github.com/mapnik/node-mapnik
-Source0:        https://github.com/mapnik/node-mapnik/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+Source0:        https://github.com/mapnik/node-mapnik/archive/%{commit}/node-mapnik-%{commit}.tar.gz
 # Reported upstream - https://github.com/mapnik/node-mapnik/issues/163
 Patch0:         nodejs-mapnik-color.patch
-# Correct system font paths
-Patch1:         nodejs-mapnik-fonts.patch
 # Reported upstream - https://github.com/mapnik/node-mapnik/issues/170
-Patch2:         nodejs-mapnik-precision.patch
+Patch1:         nodejs-mapnik-precision.patch
 # Disable HSV support - not supported in Fedora mapnik build
-Patch3:         nodejs-mapnik-hsv.patch
+Patch2:         nodejs-mapnik-hsv.patch
 ExclusiveArch:  %{nodejs_arches}
 
 BuildRequires:  nodejs-devel
@@ -47,7 +44,6 @@ BuildRequires:  npm(sphericalmercator)
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %nodejs_fixdep -r node-pre-gyp
 rm -rf node_modules
 echo '{}' > common.gypi
@@ -80,6 +76,9 @@ ln -s  %{nodejs_sitelib}/mapnik/bin/mapnik-render.js %{buildroot}/%{_bindir}/map
 
 
 %changelog
+* Thu Apr  3 2014 Tom Hughes <tom at compton.nu> - 1.4.2-1
+- Update to 1.4.2 upstream release
+
 * Mon Mar  3 2014 Tom Hughes <tom at compton.nu> - 1.4.0-2
 - Remove nodejs-pre-gyp dependency
 
diff --git a/sources b/sources
index 3b9ef72..1dacb96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-313ec19987b7fdc336bb717de0f7f23d  nodejs-mapnik-1.4.0-9ca8720.tar.gz
+c3ee23d6da50558e2830053b0aa62c10  node-mapnik-549e90e01cdb071abe4db3ba512036928241079d.tar.gz