diff --git a/.gitignore b/.gitignore index 4956525..018a882 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /kosmtik-0.0.9.tgz /kosmtik-0.0.11.tgz /kosmtik-0.0.12.tgz +/kosmtik-0.0.13.tgz diff --git a/kosmtik-metatile.patch b/kosmtik-metatile.patch new file mode 100644 index 0000000..35a118c --- /dev/null +++ b/kosmtik-metatile.patch @@ -0,0 +1,19 @@ +commit fe4530531502b99310294de848379d00b0a0ab29 +Author: Tom Hughes +Date: Thu Nov 12 00:33:56 2015 +0000 + + Fix evaluation order + +diff --git a/src/back/loader/Base.js b/src/back/loader/Base.js +index 3839111..889e08d 100644 +--- a/src/back/loader/Base.js ++++ b/src/back/loader/Base.js +@@ -7,7 +7,7 @@ var BaseLoader = function (project) { + }; + + BaseLoader.prototype.postprocess = function () { +- this.mml.metatile = +(this.mml.metatile || this.mml.source ? 1 : 2); // Default vectortiles to 1, classic to 2. ++ this.mml.metatile = +(this.mml.metatile || (this.mml.source ? 1 : 2)); // Default vectortiles to 1, classic to 2. + if (this.mml.Stylesheet) { + this.mml.Stylesheet = this.mml.Stylesheet.map(this.normalizeStylesheet.bind(this)); + } diff --git a/kosmtik.spec b/kosmtik.spec index 322a812..1f3aa44 100644 --- a/kosmtik.spec +++ b/kosmtik.spec @@ -1,15 +1,17 @@ Name: kosmtik -Version: 0.0.12 +Version: 0.0.13 Release: 1%{?dist} Summary: Make maps with OpenStreetMap and Mapnik License: WTFPL URL: https://github.com/kosmtik/kosmtik -Source0: http://registry.npmjs.org/kosmtik/-/kosmtik-%{version}.tgz +Source0: https://registry.npmjs.org/kosmtik/-/kosmtik-%{version}.tgz # Use system fonts Patch0: kosmtik-fonts.patch # Don't test for exact mapnik output Patch1: kosmtik-mapnik.patch +# +Patch2: kosmtik-metatile.patch BuildArch: noarch ExclusiveArch: %{nodejs_arches} noarch @@ -40,11 +42,9 @@ For now, only Carto based projects are supported (with .mml or %setup -q -n package %patch0 -p1 %patch1 -p1 -%nodejs_fixdep carto "^0.15.0" +%patch2 -p1 %nodejs_fixdep generic-pool "^2.0.3" %nodejs_fixdep js-yaml "^2.1.3" -%nodejs_fixdep json-localizer "^0.0.3" -%nodejs_fixdep leaflet-formbuilder "^0.2.0" %nodejs_fixdep mapnik "^1.4.17" %nodejs_fixdep nomnom "^1.8.0" %nodejs_fixdep npm "^1.3.6" @@ -97,6 +97,9 @@ ln -s %{nodejs_sitelib}/kosmtik/index.js %{buildroot}%{_bindir}/kosmtik %changelog +* Thu Nov 12 2015 Tom Hughes - 0.0.13-1 +- Update to 0.0.13 upstream release + * Wed Oct 7 2015 Tom Hughes - 0.0.12-1 - Update to 0.0.12 upstream release diff --git a/sources b/sources index 2cc6797..38df0d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53b23a6bf293c15c4848aa4691a12714 kosmtik-0.0.12.tgz +03bccf41c44acf1af7d38ca63bdc3888 kosmtik-0.0.13.tgz