diff --git a/.gitignore b/.gitignore index 89ee6b3..046a555 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /leaflet-0.7.4.tgz /leaflet-0.7.5.tgz /leaflet-0.7.7.tgz +/leaflet-1.0.0.tgz diff --git a/nodejs-leaflet-git-rev.patch b/nodejs-leaflet-git-rev.patch new file mode 100644 index 0000000..50c4c34 --- /dev/null +++ b/nodejs-leaflet-git-rev.patch @@ -0,0 +1,31 @@ +commit 4078baa997dd599c1f88773543b16d94e82407ba +Author: Tom Hughes +Date: Wed Sep 28 19:50:56 2016 +0100 + + Patch out use of git-rev + +diff --git a/Jakefile.js b/Jakefile.js +index 35f4a02..b1f8a94 100644 +--- a/Jakefile.js ++++ b/Jakefile.js +@@ -13,8 +13,7 @@ For a custom build, open build/build.html in the browser and follow the instruct + */ + + var build = require('./build/build.js'), +- buildDocs = require('./build/docs'), +- git = require('git-rev'); ++ buildDocs = require('./build/docs'); + + function hint(msg, args) { + return function () { +@@ -36,9 +35,7 @@ function calculateVersion(officialRelease, callback) { + if (officialRelease) { + callback(version); + } else { +- git.short(function(str) { +- callback (version + '+' + str); +- }); ++ throw "git-rev not available"; + } + } + diff --git a/nodejs-leaflet-jshint.patch b/nodejs-leaflet-jshint.patch deleted file mode 100644 index 1d64f0c..0000000 --- a/nodejs-leaflet-jshint.patch +++ /dev/null @@ -1,16 +0,0 @@ -commit fc5892432ddd8f6501bf74e0c26d2cf8f891e02b -Author: Tom Hughes -Date: Sat Nov 15 14:43:57 2014 +0000 - - Don't require jshint as it is not used - -diff --git a/build/build.js b/build/build.js -index ad364fc..04353a7 100644 ---- a/build/build.js -+++ b/build/build.js -@@ -1,5 +1,4 @@ - var fs = require('fs'), -- jshint = require('jshint'), - UglifyJS = require('uglify-js'), - zlib = require('zlib'), - diff --git a/nodejs-leaflet.spec b/nodejs-leaflet.spec index 3f5974c..0afef5f 100644 --- a/nodejs-leaflet.spec +++ b/nodejs-leaflet.spec @@ -1,15 +1,15 @@ %global enable_tests 0 Name: nodejs-leaflet -Version: 0.7.7 -Release: 2%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: An open source JavaScript Library for Interactive Maps License: BSD URL: http://leafletjs.com/ Source0: http://registry.npmjs.org/leaflet/-/leaflet-%{version}.tgz -# https://github.com/Leaflet/Leaflet/pull/3028 -Patch0: nodejs-leaflet-jshint.patch +# Patch out use of git-rev +Patch0: nodejs-leaflet-git-rev.patch BuildArch: noarch ExclusiveArch: %{nodejs_arches} noarch @@ -47,14 +47,13 @@ interactive maps. %prep -%setup -q -n package -%patch0 -p1 +%autosetup -p 1 -n package rm -rf node_modules dist/*.js %build %nodejs_symlink_deps --build -jake build +jake build[,,true] %install @@ -78,11 +77,15 @@ jake test %files -n js-leaflet -%doc LICENSE README.md CHANGELOG.md CONTRIBUTING.md FAQ.md PLUGIN-GUIDE.md +%doc README.md CHANGELOG.md CONTRIBUTING.md FAQ.md PLUGIN-GUIDE.md +%license LICENSE %{_jsdir}/leaflet %changelog +* Wed Sep 28 2016 Tom Hughes - 1.0.0-1 +- Update to 1.0.0 upstream release + * Thu Feb 04 2016 Fedora Release Engineering - 0.7.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 45960b4..4bf2e08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -39f8ccbc87a538f1f24d193fe2857059 leaflet-0.7.7.tgz +3fe1b4cb7748169a4ad42a55daa5f67d leaflet-1.0.0.tgz