diff --git a/.gitignore b/.gitignore index 5691668..c8fec75 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /geometry-test-data-e5aba5501c82e307120dd2c746cd682e262feba4.tar.gz /mapnik-vector-tile-1.0.0.tar.gz /geometry-test-data-0c2f87c33ac9b05f97f2542d17242d2376fb885b.tar.gz +/mapnik-vector-tile-1.0.1.tar.gz diff --git a/nodejs-mapnik-vector-tile-dependencies.patch b/nodejs-mapnik-vector-tile-dependencies.patch index fc0fa0b..28ea53d 100644 --- a/nodejs-mapnik-vector-tile-dependencies.patch +++ b/nodejs-mapnik-vector-tile-dependencies.patch @@ -1,11 +1,11 @@ -commit 3fd2cee1c84b665517fb39547c0a1ca5f164262b +commit 930e38527584b6a57de0d6995d68afc816099080 Author: Tom Hughes Date: Mon Nov 23 00:12:59 2015 +0000 Patch out attempts to clone various dependencies diff --git a/Makefile b/Makefile -index 1657594..b9ed2b7 100755 +index 6c436d1..b9ed2b7 100755 --- a/Makefile +++ b/Makefile @@ -1,23 +1,10 @@ @@ -13,7 +13,7 @@ index 1657594..b9ed2b7 100755 BUILDTYPE ?= Release -CLIPPER_REVISION=7484da1e7caf3250aa091925518f4fac91c05784 --PROTOZERO_REVISION=3868dfd6bd7ae393818ab1268fdd7bdcea2a9f0a +-PROTOZERO_REVISION=v1.3.0 -GYP_REVISION=3464008 - all: libvtile diff --git a/nodejs-mapnik-vector-tile-protozero.patch b/nodejs-mapnik-vector-tile-protozero.patch deleted file mode 100644 index 76b52c5..0000000 --- a/nodejs-mapnik-vector-tile-protozero.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit a35d9a418879c03cce95f0c5d781092f5bd22b1b -Author: Tom Hughes -Date: Thu Feb 25 08:46:48 2016 +0000 - - Patch to compile with protozero 3.0.0 - -diff --git a/src/vector_tile_config.hpp b/src/vector_tile_config.hpp -index 90d17ae..2c586c9 100644 ---- a/src/vector_tile_config.hpp -+++ b/src/vector_tile_config.hpp -@@ -7,7 +7,7 @@ - #define MAPNIK_VECTOR_INLINE - #endif - --#include -+#include - - #define VT_LEGACY_IMAGE_SIZE 256.0 - diff --git a/nodejs-mapnik-vector-tile.spec b/nodejs-mapnik-vector-tile.spec index 6beff59..a9139c3 100644 --- a/nodejs-mapnik-vector-tile.spec +++ b/nodejs-mapnik-vector-tile.spec @@ -2,7 +2,7 @@ %global geometry_test_data_commit 0c2f87c33ac9b05f97f2542d17242d2376fb885b Name: nodejs-mapnik-vector-tile -Version: 1.0.0 +Version: 1.0.1 Release: 1%{?dist} Summary: Mapnik API for working with vector tiles @@ -13,8 +13,6 @@ Source1: https://github.com/mapnik/clipper/archive/%{clipper_commit}/clip Source2: https://github.com/mapnik/geometry-test-data/archive/%{geometry_test_data_commit}/geometry-test-data-%{geometry_test_data_commit}.tar.gz # Patch out attempts to clone dependencies from github Patch0: nodejs-mapnik-vector-tile-dependencies.patch -# https://github.com/mapbox/mapnik-vector-tile/pull/186 -Patch1: nodejs-mapnik-vector-tile-protozero.patch BuildArch: noarch ExclusiveArch: %{nodejs_arches} noarch @@ -76,6 +74,9 @@ make %{?_smp_mflags} test %changelog +* Sat Feb 27 2016 Tom Hughes - 1.0.1-1 +- Update to 1.0.1 upstream release + * Thu Feb 25 2016 Tom Hughes - 1.0.0-1 - Update to 1.0.0 upstream release diff --git a/sources b/sources index 72ac2ea..0708837 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -d9c9a56ea2d968d21cf556e943efe0e2 mapnik-vector-tile-1.0.0.tar.gz +0124bcda7c740c193e02964055e93d84 mapnik-vector-tile-1.0.1.tar.gz e7f79321a7bf2fb9b773b875cdee5e8d clipper-7484da1e7caf3250aa091925518f4fac91c05784.tar.gz a3a25fc0e2d02df26cd5a84b57d728e2 geometry-test-data-0c2f87c33ac9b05f97f2542d17242d2376fb885b.tar.gz