[nodejs-millstone/f19] Rebuild against nodejs-request 2.16

[Tom Hughes]

commit be3874e161a370491b628b505c79a9cf066ff212
Author: Tom Hughes <tom at compton.nu>
Date:   Thu Apr 4 12:27:28 2013 +0100

    Rebuild against nodejs-request 2.16

 nodejs-millstone-request.patch    |   13 ++++++++-----
 nodejs-millstone-underscore.patch |    6 +++---
 nodejs-millstone.spec             |   21 ++++++++++++---------
 3 files changed, 23 insertions(+), 17 deletions(-)
---
diff --git a/nodejs-millstone-request.patch b/nodejs-millstone-request.patch
index 4c97727..ed85e1b 100644
--- a/nodejs-millstone-request.patch
+++ b/nodejs-millstone-request.patch
@@ -1,11 +1,14 @@
-commit b8186f848b37295ed1f1cfecf6d65e612b692f2b
+commit feef864fdc2a30888fcc70fc36ab6d0965b98716
 Author: Tom Hughes <tom at compton.nu>
-Date:   Sun Feb 10 20:40:54 2013 +0000
+Date:   Thu Apr 4 12:22:33 2013 +0100
 
-    Update to use v2.14.x of request
+    Relax request requirement to 2.x
+    
+    The second number seems to be the true minor version, and the third
+    just used to reissue a new release of the same basic version.
 
 diff --git a/package.json b/package.json
-index 6f8321f..f9dda8a 100644
+index 6f8321f..c975378 100644
 --- a/package.json
 +++ b/package.json
 @@ -18,7 +18,7 @@
@@ -13,7 +16,7 @@ index 6f8321f..f9dda8a 100644
          "step": "~0.0.5",
          "generic-pool": "~2.0.3",
 -        "request": "~2.11.4",
-+        "request": "~2.14.0",
++        "request": "2.x",
          "srs": "~0.2.20",
          "zipfile": "0.x",
          "sqlite3": "2.x",
diff --git a/nodejs-millstone-underscore.patch b/nodejs-millstone-underscore.patch
index 83b0dc4..268c79c 100644
--- a/nodejs-millstone-underscore.patch
+++ b/nodejs-millstone-underscore.patch
@@ -1,11 +1,11 @@
-commit 1f343c6f3723594b37e9dae8973d52f4db20d1a0
+commit ed22b60cf4d1b21008712738d48d1f7c4b297f97
 Author: Tom Hughes <tom at compton.nu>
 Date:   Wed Feb 13 00:05:31 2013 +0000
 
     Update to use v1.4.x of underscore
 
 diff --git a/package.json b/package.json
-index f9dda8a..a2aea0d 100644
+index c975378..7c5c1d2 100644
 --- a/package.json
 +++ b/package.json
 @@ -15,7 +15,7 @@
@@ -16,4 +16,4 @@ index f9dda8a..a2aea0d 100644
 +        "underscore": "~1.4.4",
          "step": "~0.0.5",
          "generic-pool": "~2.0.3",
-         "request": "~2.14.0",
+         "request": "2.x",
diff --git a/nodejs-millstone.spec b/nodejs-millstone.spec
index d7687aa..e7c59d7 100644
--- a/nodejs-millstone.spec
+++ b/nodejs-millstone.spec
@@ -2,7 +2,7 @@
 
 Name:           nodejs-millstone
 Version:        0.5.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Prepares data sources in an MML file for consumption in Mapnik
 
 License:        BSD
@@ -54,26 +54,29 @@ rm -rf node_modules
 %build
 
 
-%if 0%{?enable_tests}
-%check
-ln -s %{nodejs_sitelib} .
-NODE_PATH=lib %{nodejs_sitelib}/mocha/bin/mocha -R spec --timeout 10000
-%endif
-
-
 %install
 mkdir -p %{buildroot}/%{nodejs_sitelib}/millstone
 cp -pr package.json bin lib %{buildroot}/%{nodejs_sitelib}/millstone
 %nodejs_symlink_deps
 
 
+%if 0%{?enable_tests}
+%check
+%nodejs_symlink_deps --check
+NODE_PATH=lib %{nodejs_sitelib}/mocha/bin/mocha -R spec --timeout 10000
+%endif
+
+
 %files
 %doc LICENSE README.md CHANGELOG.md architecture.txt
 %{nodejs_sitelib}/millstone
 
 
 %changelog
-* Thu Mar 14 2013 Tom Hughes <thh at cyberscience.com> - 0.5.15-2
+* Thu Apr  4 2013 Tom Hughes <tom at compton.nu> - 0.5.15-3
+- Rebuild against nodejs-request 2.16
+
+* Thu Mar 14 2013 Tom Hughes <tom at compton.nu> - 0.5.15-2
 - Rebuild against nodejs-request 2.14
 
 * Sun Feb 10 2013 Tom Hughes <tom at compton.nu> - 0.5.15-1