From cf953e1eb6d429ed48c0e6c0a2d013a36d35fc42 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: May 02 2014 14:25:39 +0000
Subject: Fix srs dependency


---

diff --git a/nodejs-millstone.spec b/nodejs-millstone.spec
index 3e330d6..288eeb0 100644
--- a/nodejs-millstone.spec
+++ b/nodejs-millstone.spec
@@ -2,7 +2,7 @@
 
 Name:           nodejs-millstone
 Version:        0.6.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Prepares data sources in an MML file for consumption in Mapnik
 
 License:        BSD
@@ -38,7 +38,12 @@ flush can be used to clear the cache of a specific resource.
 %setup -q -n package
 %nodejs_fixdep request "2.x"
 %nodejs_fixdep optimist "~0.4.0"
+<<<<<<< HEAD
 %nodejs_fixdep underscore "~1.6"
+=======
+%nodejs_fixdep srs "~0.4.0"
+%nodejs_fixdep underscore "~1.5.1"
+>>>>>>> Fix srs dependency
 %nodejs_fixdep zipfile "~0.5.0"
 rm -rf node_modules
 
@@ -65,6 +70,9 @@ NODE_PATH=lib %{nodejs_sitelib}/mocha/bin/mocha -R spec --timeout 10000
 
 
 %changelog
+* Fri May  2 2014 Tom Hughes <tom@compton.nu> - 0.6.12-4
+- Fix srs dependency
+
 * Fri Apr 18 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 0.6.12-3
 - fix version of npm(underscore) dependency