[nodejs-mapnik] Update to 1.1.0 upstream release

Tom Hughes tomh at fedoraproject.org
Mon Jul 15 19:52:33 UTC 2013


commit 53c1bdfe602df1c0f281ca04d2bbfd3041699719
Author: Tom Hughes <tom at compton.nu>
Date:   Mon Jul 15 15:07:47 2013 +0100

    Update to 1.1.0 upstream release

 .gitignore                      |    1 +
 nodejs-mapnik-coordinates.patch |   52 ---------------------------------------
 nodejs-mapnik.spec              |   14 ++++++----
 sources                         |    2 +-
 4 files changed, 10 insertions(+), 59 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 86217d8..afdd63a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /mapnik-1.0.0.tgz
+/mapnik-1.1.0.tgz
diff --git a/nodejs-mapnik.spec b/nodejs-mapnik.spec
index 3d19fa2..8a83945 100644
--- a/nodejs-mapnik.spec
+++ b/nodejs-mapnik.spec
@@ -1,8 +1,8 @@
 %global enable_tests 1
 
 Name:           nodejs-mapnik
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 Summary:        Bindings to Mapnik tile rendering library for Node.js
 
 License:        BSD
@@ -12,8 +12,6 @@ Source0:        http://registry.npmjs.org/mapnik/-/mapnik-%{version}.tgz
 Patch0:         nodejs-mapnik-geojson.patch
 # Reported upstream - https://github.com/mapnik/node-mapnik/issues/163
 Patch1:         nodejs-mapnik-color.patch
-# Patch from upstream - https://github.com/mapnik/node-mapnik/issues/164
-Patch2:         nodejs-mapnik-coordinates.patch
 ExclusiveArch:  %{nodejs_arches}
 
 BuildRequires:  nodejs-devel
@@ -27,7 +25,7 @@ BuildRequires:  cairo-devel
 BuildRequires:  polyclipping-devel
 BuildRequires:  protobuf-lite-devel
 BuildRequires:  libtool-ltdl-devel
-BuildRequires:  npm(mapnik-vector-tile)
+BuildRequires:  npm(mapnik-vector-tile) >= 0.1.0
 
 %if 0%{?enable_tests}
 BuildRequires:  npm(mocha)
@@ -42,7 +40,6 @@ BuildRequires:  npm(sphericalmercator)
 %setup -q -n package
 %patch0 -p1 -b .geojson
 %patch1 -p1 -b .color
-%patch2 -p1 -b .coordinates
 rm -rf node_modules
 %nodejs_symlink_deps --check
 
@@ -52,6 +49,7 @@ export CXXFLAGS="%{optflags}"
 node-gyp rebuild
 install -p -D -m0755 build/Release/_mapnik.node lib
 python gen_settings.py 
+%nodejs_fixdep -r mapnik-vector-tile
 
 
 %install
@@ -77,6 +75,10 @@ NODE_PATH=lib %{nodejs_sitelib}/mocha/bin/mocha -R spec -t 5000
 
 
 %changelog
+* Mon Jul 15 2013 Tom Hughes <tom at compton.nu> - 1.1.0-1
+- Update to 1.1.0 upstream release
+- Remove mapnik-vector-tile from run time dependencies
+
 * Tue Jul  9 2013 Tom Hughes <tom at compton.nu> - 1.0.0-2
 - Add upstream patch for numeric precision issue
 
diff --git a/sources b/sources
index 56e28f1..01c3905 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-878145dd12a27999a5b4276f26f8d0a5  mapnik-1.0.0.tgz
+95c73ba3183a3696545ddc78853b7ef8  mapnik-1.1.0.tgz


More information about the scm-commits mailing list