[nodejs-srs] Update to 0.3.0 upstream release

[Tom Hughes]

commit 05427100ccf1dda4ae46aa946aa8dba23a1b5aac
Author: Tom Hughes <tom at compton.nu>
Date:   Thu Aug 8 10:36:46 2013 +0100

    Update to 0.3.0 upstream release

 .gitignore                 |    1 +
 nodejs-srs-cleaner.sh      |    2 +-
 nodejs-srs-libraries.patch |   34 +++++++++++++++++++---------------
 nodejs-srs-tests.patch     |    6 +++---
 nodejs-srs.spec            |   14 ++++++++------
 sources                    |    2 +-
 6 files changed, 33 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b03c348..bbe8472 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /srs-0.2.20-fedora.tgz
+/srs-0.3.0-fedora.tgz
diff --git a/nodejs-srs-cleaner.sh b/nodejs-srs-cleaner.sh
index b7798b7..c06e036 100755
--- a/nodejs-srs-cleaner.sh
+++ b/nodejs-srs-cleaner.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="0.2.20"
+VERSION="0.3.0"
 
 tar xvfz srs-"${VERSION}".tgz
 
diff --git a/nodejs-srs-libraries.patch b/nodejs-srs-libraries.patch
index c568038..89c7e9c 100644
--- a/nodejs-srs-libraries.patch
+++ b/nodejs-srs-libraries.patch
@@ -1,15 +1,19 @@
---- binding.gyp.libraries	2012-07-11 17:42:33.000000000 +0100
-+++ binding.gyp	2013-02-10 15:09:37.038037109 +0000
-@@ -23,6 +23,12 @@
-         '_LARGEFILE_SOURCE',
-         '_FILE_OFFSET_BITS=64',
-       ],
-+      'libraries': [ 
-+        '-lgdal',
-+      ],
-+      'include_dirs': [
-+        '/usr/include/gdal',
-+      ],
-       'conditions': [
-         [ 'OS=="mac"', {
-           'libraries': [
+commit d63269d0ed79f48c84d4b3c9e2d7be448faa9c00
+Author: Tom Hughes <tom at compton.nu>
+Date:   Thu Aug 8 10:50:38 2013 +0100
+
+    Don't explicitly link against gdal dependencies
+
+diff --git a/binding.gyp b/binding.gyp
+index 3275c72..5a24d1d 100644
+--- a/binding.gyp
++++ b/binding.gyp
+@@ -13,7 +13,7 @@
+   'targets': [
+     {
+       'target_name': '_srs',
+-      'libraries' : ['<!@(gdal-config --libs)','<!@(gdal-config --dep-libs)'],
++      'libraries' : ['<!@(gdal-config --libs)'],
+       'cflags_cc' : ['<!@(gdal-config --cflags)'],
+       'cflags_cc!': ['-fno-rtti', '-fno-exceptions'],
+       'xcode_settings': {
diff --git a/nodejs-srs-tests.patch b/nodejs-srs-tests.patch
index d4eacbf..12d064c 100644
--- a/nodejs-srs-tests.patch
+++ b/nodejs-srs-tests.patch
@@ -1,4 +1,4 @@
-commit d0b005ce112dc782017032dff5cd8a6d84222244
+commit d0f7810adebf2473ab99a6867a10444755577dc3
 Author: Tom Hughes <tom at compton.nu>
 Date:   Sat Mar 2 14:56:05 2013 +0000
 
@@ -16,10 +16,10 @@ index c507016..5207eef 100644
  "features": [
  { "type": "Feature",
 diff --git a/test/shapefile.3857.test.js b/test/shapefile.3857.test.js
-index 5ac6abc..1292695 100644
+index b500e38..bc42360 100644
 --- a/test/shapefile.3857.test.js
 +++ b/test/shapefile.3857.test.js
-@@ -103,18 +103,6 @@ describe('Mercator', function() {
+@@ -126,18 +126,6 @@ describe('Mercator', function() {
          assert.equal(parsed.valid, expected.valid);
      });
  
diff --git a/nodejs-srs.spec b/nodejs-srs.spec
index 126e2dd..a99bf4b 100644
--- a/nodejs-srs.spec
+++ b/nodejs-srs.spec
@@ -1,8 +1,8 @@
 %global enable_tests 1
 
 Name:           nodejs-srs
-Version:        0.2.20
-Release:        4%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Spatial reference library for Node.js
 
 License:        BSD
@@ -16,12 +16,11 @@ Source0:        srs-%{version}-fedora.tgz
 Source1:        nodejs-srs-cleaner.sh
 # Settings file normally generated by waf build
 Source2:        nodejs-srs-settings.js
-# Link against system libraries
+# Fix library linking
 Patch0:         nodejs-srs-libraries.patch
 # Patch out tests which rely on removed files
 Patch1:         nodejs-srs-tests.patch
-
-ExclusiveArch:  %{ix86} x86_64 %{arm}
+ExclusiveArch:  %{nodejs_arches}
 
 BuildRequires:  nodejs-devel
 BuildRequires:  node-gyp
@@ -41,7 +40,7 @@ Bindings to libosr for handling spatial references in Node.js.
 
 %prep
 %setup -q -n package-fedora
-%patch0 -p0 -b .libraries
+%patch0 -p1 -b .libraries
 %patch1 -p1 -b .tests
 cp -pr %{SOURCE2} lib/settings.js
 rm -rf deps node_modules lib/srs_data
@@ -72,6 +71,9 @@ NODE_PATH=lib %{nodejs_sitearch}/mocha/bin/mocha -R spec
 
 
 %changelog
+* Thu Aug  8 2013 Tom Hughes <tom at compton.nu> - 0.3.0-1
+- Update to 0.3.0 upstream release
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.20-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 3bd52cd..4cce394 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-50d018b047b1a776a574f884115dea4f  srs-0.2.20-fedora.tgz
+4d7e0afddd56c44b96015c0e52ebae52  srs-0.3.0-fedora.tgz