From cea974f56b5caf52878d8bfddff887c12597a864 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Aug 26 2014 23:07:44 +0000
Subject: Update to 1.4.13 upstream release


---

diff --git a/.gitignore b/.gitignore
index cb33a09..f0b53f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /node-mapnik-9711f6561d1bb3965a98d6ac638c0e44f9915d5a.tar.gz
 /node-mapnik-ae61e6df4a6150089935ff8a3ae098eef3d0c839.tar.gz
 /node-mapnik-640482f40ccb8883fbfaebe2377a52a62507ef2c.tar.gz
+/node-mapnik-153a1f17ba8dd51763aca62365079c402635e868.tar.gz
diff --git a/nodejs-mapnik-aspect.patch b/nodejs-mapnik-aspect.patch
new file mode 100644
index 0000000..3552798
--- /dev/null
+++ b/nodejs-mapnik-aspect.patch
@@ -0,0 +1,44 @@
+commit c991f9eefebd4834c949f2a384f45d7f95cb7036
+Author: Tom Hughes <tom@compton.nu>
+Date:   Tue Aug 26 22:53:27 2014 +0100
+
+    Only define ASPECT_RESPECT if mapnik supports it
+
+diff --git a/src/mapnik_map.cpp b/src/mapnik_map.cpp
+index 9ee1155..63b2f84 100644
+--- a/src/mapnik_map.cpp
++++ b/src/mapnik_map.cpp
+@@ -111,8 +111,10 @@ void Map::Initialize(Handle<Object> target) {
+                                 "ASPECT_ADJUST_CANVAS_WIDTH",mapnik::Map::ADJUST_CANVAS_WIDTH)
+     NODE_MAPNIK_DEFINE_CONSTANT(lcons->GetFunction(),
+                                 "ASPECT_ADJUST_CANVAS_HEIGHT",mapnik::Map::ADJUST_CANVAS_HEIGHT)
++#if MAPNIK_VERSION >= 200300
+     NODE_MAPNIK_DEFINE_CONSTANT(lcons->GetFunction(),
+                                 "ASPECT_RESPECT",mapnik::Map::RESPECT)
++#endif
+ 
+     target->Set(NanNew("Map"),lcons->GetFunction());
+     NanAssignPersistent(constructor, lcons);
+diff --git a/test/map.test.js b/test/map.test.js
+index 8925286..6fd4a61 100644
+--- a/test/map.test.js
++++ b/test/map.test.js
+@@ -45,11 +45,13 @@ describe('mapnik.Map', function() {
+         map.extent = world;
+         // will have been made square
+         assert.deepEqual(map.extent,[-180,-180,180,180]);
+-        // now try again after disabling the "fixing"
+-        map.aspect_fix_mode = mapnik.Map.ASPECT_RESPECT;
+-        assert.equal(map.aspect_fix_mode,mapnik.Map.ASPECT_RESPECT);
+-        map.extent = world;
+-        assert.deepEqual(map.extent,world);
++        if (mapnik.versions.mapnik_number >= 200300) {
++            // now try again after disabling the "fixing"
++            map.aspect_fix_mode = mapnik.Map.ASPECT_RESPECT;
++            assert.equal(map.aspect_fix_mode,mapnik.Map.ASPECT_RESPECT);
++            map.extent = world;
++            assert.deepEqual(map.extent,world);
++        }
+         //map.maximumExtent = map.extent;
+         //assert.equal(map.maximumExtent,map.extent)
+     });
diff --git a/nodejs-mapnik.spec b/nodejs-mapnik.spec
index b8c35ee..b5e2f4a 100644
--- a/nodejs-mapnik.spec
+++ b/nodejs-mapnik.spec
@@ -1,7 +1,7 @@
-%global commit 640482f40ccb8883fbfaebe2377a52a62507ef2c
+%global commit 153a1f17ba8dd51763aca62365079c402635e868
 
 Name:           nodejs-mapnik
-Version:        1.4.12
+Version:        1.4.13
 Release:        1%{?dist}
 Summary:        Bindings to Mapnik tile rendering library for Node.js
 
@@ -20,6 +20,8 @@ Patch3:         nodejs-mapnik-pregyp.patch
 Patch4:         nodejs-mapnik-webp.patch
 # Remove native SVG renderer tests as our mapnik doesn't support it
 Patch5:         nodejs-mapnik-svg.patch
+#
+Patch6:         nodejs-mapnik-aspect.patch
 ExclusiveArch:  %{nodejs_arches}
 
 BuildRequires:  nodejs-devel
@@ -55,6 +57,7 @@ BuildRequires:  npm(nan) >= 1.2.0
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 rm -rf node_modules
 echo '{}' > common.gypi
 %nodejs_symlink_deps --check
@@ -88,6 +91,9 @@ ln -s  %{nodejs_sitelib}/mapnik/bin/mapnik-render.js %{buildroot}/%{_bindir}/map
 
 
 %changelog
+* Tue Aug 26 2014 Tom Hughes <tom@compton.nu> - 1.4.13-1
+- Update to 1.4.13 upstream release
+
 * Mon Aug 18 2014 Tom Hughes <tom@compton.nu> - 1.4.12-1
 - Update to 1.4.12 upstream release
 
diff --git a/sources b/sources
index baeaf0a..5fdae05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8199d16fd6aa160a6c50b7d7f720eb54  node-mapnik-640482f40ccb8883fbfaebe2377a52a62507ef2c.tar.gz
+e20e3f6115043a94f2ca95c8d989ec59  node-mapnik-153a1f17ba8dd51763aca62365079c402635e868.tar.gz