[nodejs-millstone] Update to 0.6.10 upstream releae

[Tom Hughes]

commit e276b2bfb13c7f50d072576c7c56ba4dcd25d415
Author: Tom Hughes <tom at compton.nu>
Date:   Thu Feb 6 18:27:52 2014 +0000

    Update to 0.6.10 upstream releae

 .gitignore                   |    1 +
 nodejs-millstone-tests.patch |   68 ++++++++++++++++++++++++++++++++++++++++++
 nodejs-millstone.spec        |   15 ++++++---
 sources                      |    2 +-
 4 files changed, 80 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 137aad9..b39704b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /millstone-0.6.4.tgz
 /millstone-0.6.5.tgz
 /millstone-0.6.8.tgz
+/millstone-0.6.10.tgz
diff --git a/nodejs-millstone-tests.patch b/nodejs-millstone-tests.patch
new file mode 100644
index 0000000..640d118
--- /dev/null
+++ b/nodejs-millstone-tests.patch
@@ -0,0 +1,68 @@
+commit 2cdba92f861427c2fde9797b03fb60f8a632ee9e
+Author: Tom Hughes <tom at compton.nu>
+Date:   Thu Feb 6 18:42:54 2014 +0000
+
+    Remove layer_by_index from expected results in tests
+
+diff --git a/test/markers.test.js b/test/markers.test.js
+index db66c91..fb5117b 100644
+--- a/test/markers.test.js
++++ b/test/markers.test.js
+@@ -61,8 +61,7 @@ it('correctly localizes zipped json', function(done) {
+                 "name": "polygons-zipped",
+                 "Datasource": {
+                     "file": path.join(__dirname, 'zipped-json/layers/polygons-zipped/7e482cc8-polygons.json.json'),
+-                    "type": "ogr",
+-                    "layer_by_index": 0
++                    "type": "ogr"
+                 },
+                 "srs": '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'
+             }
+diff --git a/test/nosymlink.test.js b/test/nosymlink.test.js
+index e57b5cf..caa2ce6 100644
+--- a/test/nosymlink.test.js
++++ b/test/nosymlink.test.js
+@@ -71,8 +71,7 @@ it('correctly handles files without symlinking', function(done) {
+                 "name": "four",
+                 "Datasource": {
+                     "file": path.join(__dirname, "nosymlink/points.vrt"),
+-                    "type": "ogr",
+-                    "layer_by_index": 0
++                    "type": "ogr"
+                 },
+                 "srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs"
+             },
+diff --git a/test/test.js b/test/test.js
+index ba6c9c9..fef9e66 100644
+--- a/test/test.js
++++ b/test/test.js
+@@ -178,8 +178,7 @@ it('correctly caches remote files', function(done) {
+                 "name": "local-json",
+                 "Datasource": {
+                     "file": path.join(__dirname, 'cache/layers/local.json'),
+-                    "type": "ogr",
+-                    "layer_by_index": 0
++                    "type": "ogr"
+                 },
+                 "srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs"
+             },
+@@ -195,8 +194,7 @@ it('correctly caches remote files', function(done) {
+                 "name": "absolute-json",
+                 "Datasource": {
+                     "file": path.join(__dirname, 'cache/layers/absolute-json.json'),
+-                    "type": "ogr",
+-                    "layer_by_index": 0
++                    "type": "ogr"
+                 },
+                 "srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs"
+             },
+@@ -212,8 +210,7 @@ it('correctly caches remote files', function(done) {
+                 "name": "polygons",
+                 "Datasource": {
+                     "file": path.join(__dirname, 'cache/layers/polygons.json'),
+-                    "type": "ogr",
+-                    "layer_by_index": 0
++                    "type": "ogr"
+                 },
+                 "srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs"
+             },
diff --git a/nodejs-millstone.spec b/nodejs-millstone.spec
index 5e52acc..b5e7446 100644
--- a/nodejs-millstone.spec
+++ b/nodejs-millstone.spec
@@ -1,13 +1,15 @@
 %global enable_tests 0
 
 Name:           nodejs-millstone
-Version:        0.6.8
-Release:        2%{?dist}
+Version:        0.6.10
+Release:        1%{?dist}
 Summary:        Prepares data sources in an MML file for consumption in Mapnik
 
 License:        BSD
 URL:            https://github.com/mapbox/millstone
 Source0:        http://registry.npmjs.org/millstone/-/millstone-%{version}.tgz
+# Reported upstrem - https://github.com/mapbox/millstone/pull/113
+Patch0:         nodejs-millstone-tests.patch
 BuildArch:      noarch
 ExclusiveArch:  %{nodejs_arches} noarch
 
@@ -18,10 +20,10 @@ BuildRequires:  npm(mocha)
 BuildRequires:  npm(generic-pool)
 BuildRequires:  npm(mime)
 BuildRequires:  npm(request)
-BuildRequires:  npm(srs) >= 0.3.6
+BuildRequires:  npm(srs) >= 0.3.10
 BuildRequires:  npm(step)
 BuildRequires:  npm(underscore)
-BuildRequires:  npm(zipfile)
+BuildRequires:  npm(zipfile) >= 0.4.3
 %endif
 
 %description
@@ -36,9 +38,9 @@ flush can be used to clear the cache of a specific resource.
 
 %prep
 %setup -q -n package
+%patch0 -p1
 %nodejs_fixdep request "2.x"
 %nodejs_fixdep optimist "~0.4.0"
-%nodejs_fixdep underscore "~1.5.1"
 rm -rf node_modules
 
 
@@ -64,6 +66,9 @@ NODE_PATH=lib %{nodejs_sitelib}/mocha/bin/mocha -R spec --timeout 10000
 
 
 %changelog
+* Thu Feb  6 2014 Tom Hughes <tom at compton.nu> - 0.6.10-1
+- Update to 0.6.10 upstream release
+
 * Sun Jan 19 2014 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.6.8-2
 - fix underscore for 1.5.1
 
diff --git a/sources b/sources
index 6e21871..c6a8539 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f72b3c5de58d2e98b2ba33c96099fe06  millstone-0.6.8.tgz
+5b09c94fbb283b09ee365e5c8ccde52a  millstone-0.6.10.tgz