diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 4503206..0000000 --- a/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/kosmtik-0.0.9.tgz -/kosmtik-0.0.11.tgz -/kosmtik-0.0.12.tgz -/kosmtik-0.0.13.tgz -/kosmtik-0.0.14.tgz -/kosmtik-0.0.15.tgz -/kosmtik-0.0.16.tgz -/kosmtik-0.0.17.tgz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/kosmtik-fonts.patch b/kosmtik-fonts.patch deleted file mode 100644 index a39e89e..0000000 --- a/kosmtik-fonts.patch +++ /dev/null @@ -1,68 +0,0 @@ -commit 69c943d62005d7f8c9e457fad9fba0becedda427 -Author: Tom Hughes -Date: Mon Dec 8 10:12:15 2014 +0000 - - Use system fonts - -diff --git a/src/back/PreviewServer.js b/src/back/PreviewServer.js -index 947bf77..e5572d2 100644 ---- a/src/back/PreviewServer.js -+++ b/src/back/PreviewServer.js -@@ -15,6 +15,7 @@ var http = require('http'), - '.jpg' : 'image/jpeg', - '.woff' : 'application/octet-stream', - '.ttf' : 'application/octet-stream', -+ '.otf' : 'application/octet-stream', - '.svg' : 'image/svg+xml', - '.ico' : 'image/x-icon' - }; -diff --git a/src/front/Core.css b/src/front/Core.css -index a509cba..deb7f28 100644 ---- a/src/front/Core.css -+++ b/src/front/Core.css -@@ -5,10 +5,7 @@ - - @font-face { - font-family: 'fira_sansbold'; -- src: url('./fonts/FiraSans-Bold.eot'); -- src: url('./fonts/FiraSans-Bold.eot?#iefix') format('embedded-opentype'), -- url('./fonts/FiraSans-Bold.woff') format('woff'), -- url('./fonts/FiraSans-Bold.ttf') format('truetype'); -+ src: url('./fonts/FiraSans-Bold.otf'); - font-weight: normal; - font-style: normal; - -@@ -17,30 +14,21 @@ - - @font-face { - font-family: 'fira_sansregular'; -- src: url('./fonts/FiraSans-Regular.eot'); -- src: url('./fonts/FiraSans-Regular.eot?#iefix') format('embedded-opentype'), -- url('./fonts/FiraSans-Regular.woff') format('woff'), -- url('./fonts/FiraSans-Regular.ttf') format('truetype'); -+ src: url('./fonts/FiraSans-Regular.otf'); - font-weight: normal; - font-style: normal; - } - - @font-face { - font-family: 'fira_sanslight'; -- src: url('./fonts/FiraSans-Light.eot'); -- src: url('./fonts/FiraSans-Light.eot?#iefix') format('embedded-opentype'), -- url('./fonts/FiraSans-Light.woff') format('woff'), -- url('./fonts/FiraSans-Light.ttf') format('truetype'); -+ src: url('./fonts/FiraSans-Light.otf'); - font-weight: normal; - font-style: normal; - } - - @font-face { - font-family: 'dejavu_sansbook'; -- src: url('./fonts/DejaVuSans-webfont.eot'); -- src: url('./fonts/DejaVuSans-webfont.eot?#iefix') format('embedded-opentype'), -- url('./fonts/DejaVuSans-webfont.woff') format('woff'), -- url('./fonts/DejaVuSans-webfont.ttf') format('truetype'); -+ src: url('./fonts/DejaVuSans.ttf'); - font-weight: normal; - font-style: normal; - diff --git a/kosmtik-mapnik.patch b/kosmtik-mapnik.patch deleted file mode 100644 index b704269..0000000 --- a/kosmtik-mapnik.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 9aaa28c180a90eef3e25ee5835190433808d2946 -Author: Tom Hughes -Date: Fri Dec 18 09:41:51 2015 +0000 - - Patch out testing for exact mapnik output - -diff --git a/test/tile.js b/test/tile.js -index 8eabfbb..a30ac92 100644 ---- a/test/tile.js -+++ b/test/tile.js -@@ -64,7 +64,7 @@ describe('#Tile()', function () { - var tile = new Tile(6, 19, 28); - tile.renderToVector(project, map, function (err, vtile) { - if (err) throw err; -- compareGeoJSON(vtile.toGeoJSON('__all__'), JSON.parse(fs.readFileSync('test/data/expected/tile.world.6.19.28.geojson'))); -+ assert.equal(JSON.parse(vtile.toGeoJSON('__all__')).type, "FeatureCollection"); - done(); - }); - }); -@@ -73,7 +73,7 @@ describe('#Tile()', function () { - var tile = new Tile(6, 19, 28); - tile.renderToVector(project, map, function (err, vtile) { - if (err) throw err; -- assert.deepEqual(vtile.getData(), fs.readFileSync('test/data/expected/tile.world.6.19.28.pbf')); -+ assert(vtile.getData().length > 0); - done(); - }); - }); diff --git a/kosmtik-world.patch b/kosmtik-world.patch deleted file mode 100644 index 9271017..0000000 --- a/kosmtik-world.patch +++ /dev/null @@ -1,17 +0,0 @@ -commit 409f5585fb1903cf96f9619c3fcd16fe5317f210 -Author: Tom Hughes -Date: Tue Feb 27 18:51:12 2018 +0000 - - Fix layer name to work with recent mapnik - -diff --git a/test/data/world/project.yml b/test/data/world/project.yml -index e63ec9c..8042ef4 100644 ---- a/test/data/world/project.yml -+++ b/test/data/world/project.yml -@@ -31,5 +31,5 @@ Layer: - Datasource: - file: "world.geojson" - type: "ogr" -- layer: "OGRGeoJSON" -+ layer: "world" - advanced: {} diff --git a/kosmtik.spec b/kosmtik.spec deleted file mode 100644 index 109c560..0000000 --- a/kosmtik.spec +++ /dev/null @@ -1,222 +0,0 @@ -Name: kosmtik -Version: 0.0.17 -Release: 8%{?dist} -Summary: Make maps with OpenStreetMap and Mapnik - -License: WTFPL -URL: https://github.com/kosmtik/kosmtik -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 -# https://github.com/kosmtik/kosmtik/pull/277 -Patch2: kosmtik-world.patch -BuildArch: noarch -ExclusiveArch: %{nodejs_arches} noarch - -# Exclude big endian architectures as mapnik does not support them -# https://github.com/mapnik/mapnik/issues/2313 -# https://bugzilla.redhat.com/show_bug.cgi?id=1395208 -ExcludeArch: ppc64 s390x - -Requires: font(dejavusans) -Requires: font(firasans) -Requires: font(firasanslight) - -BuildRequires: nodejs-packaging - -BuildRequires: npm(mocha) -BuildRequires: npm(carto) -BuildRequires: npm(js-yaml) -BuildRequires: npm(mapnik) -BuildRequires: npm(mapnik-pool) -BuildRequires: npm(nomnom) -BuildRequires: npm(npm) -BuildRequires: npm(request) - -%description -Very lite but extendable mapping framework to create Mapnik -ready maps with OpenStreetMap data (and more). - -For now, only Carto based projects are supported (with .mml or -.yml config), but in the future we hope to plug in MapCSS too. - - -%prep -%autosetup -p 1 -n package -%nodejs_fixdep carto "^0.15.3" -%nodejs_fixdep mapnik "^3.5.14" -%nodejs_fixdep npm "^6.4.1" -%nodejs_fixdep request "^2.67.0" -rm -rf node_modules src/front/fonts - - -%build - - -%install -mkdir -p %{buildroot}%{nodejs_sitelib}/kosmtik -cp -pr package.json index.js %{buildroot}%{nodejs_sitelib}/kosmtik -mkdir -p %{buildroot}%{nodejs_sitelib}/kosmtik/src -mkdir -p %{buildroot}%{_datadir}/kosmtik -pushd src - for file in $(find . -type f -name '*.js' -print) - do - cp -p --parents "${file}" "%{buildroot}%{nodejs_sitelib}/kosmtik/src" - done - for file in $(find . -type f ! -name '*.js' -print) - do - cp -p --parents "${file}" "%{buildroot}%{_datadir}/kosmtik" - mkdir -p "%{buildroot}%{nodejs_sitelib}/kosmtik/src/$(dirname ${file})" - ln -s "%{_datadir}/kosmtik/${file}" "%{buildroot}%{nodejs_sitelib}/kosmtik/src/${file}" - done -popd -mkdir -p %{buildroot}%{_datadir}/kosmtik/front/fonts -ln -s %{_datadir}/fonts/dejavu/DejaVuSans.ttf %{buildroot}%{_datadir}/kosmtik/front/fonts -ln -s %{_datadir}/fonts/mozilla-fira/FiraSans-Bold.otf %{buildroot}%{_datadir}/kosmtik/front/fonts -ln -s %{_datadir}/fonts/mozilla-fira/FiraSans-Light.otf %{buildroot}%{_datadir}/kosmtik/front/fonts -ln -s %{_datadir}/fonts/mozilla-fira/FiraSans-Regular.otf %{buildroot}%{_datadir}/kosmtik/front/fonts -ln -s %{_datadir}/kosmtik/front/fonts %{buildroot}%{nodejs_sitelib}/kosmtik/src/front -mkdir -p %{buildroot}%{_bindir} -ln -s %{nodejs_sitelib}/kosmtik/index.js %{buildroot}%{_bindir}/kosmtik -%nodejs_symlink_deps - - -%check -%nodejs_symlink_deps --check -%{nodejs_sitelib}/mocha/bin/mocha - - -%files -%doc README.md -%{nodejs_sitelib}/kosmtik -%{_datadir}/kosmtik -%{_bindir}/kosmtik - - -%changelog -* Sat Aug 01 2020 Fedora Release Engineering - 0.0.17-8 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.0.17-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 0.0.17-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 0.0.17-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0.0.17-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Sep 24 2018 Tom Hughes - 0.0.17-3 -- Update npm(npm) dependency - -* Fri Jul 13 2018 Fedora Release Engineering - 0.0.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed May 2 2018 Tom Hughes - 0.0.17-1 -- Update to 0.0.17 upstream release - -* Wed Feb 07 2018 Fedora Release Engineering - 0.0.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Sep 5 2017 Tom Hughes - 0.0.16-1 -- Update to 0.0.16 upstream release - -* Wed Jul 26 2017 Fedora Release Engineering - 0.0.15-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jun 30 2017 Tom Hughes - 0.0.15-3 -- Update npm(npm) dependency - -* Fri May 5 2017 Tom Hughes - 0.0.15-2 -- Relax npm(mapnik) dependency - -* Thu Feb 16 2017 Tom Hughes - 0.0.15-1 -- Update to 0.0.15 upstream release - -* Fri Feb 10 2017 Fedora Release Engineering - 0.0.13-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sun Jan 15 2017 Tom Hughes - 0.0.13-14 -- Exclude big endian architectures as mapnik does not support them - -* Wed Sep 28 2016 Tom Hughes - 0.0.13-13 -- Update npm(leaflet) dependency - -* Thu Feb 04 2016 Fedora Release Engineering - 0.0.13-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jan 21 2016 Tom Hughes - 0.0.13-11 -- Update dependencies - -* Wed Jan 20 2016 Tom Hughes - 0.0.13-10 -- Update request and semver dependencies - -* Sat Jan 2 2016 Tom Hughes - 0.0.13-9 -- Remove semver fixdep for nodejs 4.2 - -* Sat Jan 2 2016 Tom Hughes - 0.0.13-8 -- Update semver dependency - -* Fri Jan 1 2016 Tom Hughes - 0.0.13-7 -- Remove js-yaml fixdep - -* Sat Dec 19 2015 Tom Hughes - 0.0.13-6 -- Remove semver fixdep for nodejs 4.2 - -* Sat Dec 19 2015 Tom Hughes - 0.0.13-5 -- Put back semver fixdep - -* Fri Dec 11 2015 Tom Hughes - 0.0.13-4 -- Remove mapnik fixdep - -* Mon Dec 7 2015 Tom Hughes - 0.0.13-3 -- Remove semver fixdep - -* Thu Nov 12 2015 Tom Hughes - 0.0.13-2 -- Fix leaflet dependency - -* 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 - -* Thu Aug 27 2015 Tom Hughes - 0.0.11-3 -- Fix dependencies - -* Wed Aug 26 2015 Tom Hughes - 0.0.11-2 -- Fix dependencies - -* Tue Aug 25 2015 Tom Hughes - 0.0.11-1 -- Update to 0.0.11 upstream release - -* Tue Aug 25 2015 Tom Hughes - 0.0.9-5 -- Fix carto dependency - -* Wed Jun 17 2015 Fedora Release Engineering - 0.0.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Dec 9 2014 Tom Hughes - 0.0.9-3 -- Update for mozilla-fira-sans 3.111 - -* Mon Dec 8 2014 Tom Hughes - 0.0.9-2 -- Remove fonts from package -- Move non-js files to %%{_datadir} - -* Wed Nov 26 2014 Tom Hughes - 0.0.9-1 -- Update to 0.0.9 upstream release - -* Sun Nov 16 2014 Tom Hughes - 0.0.8-2 -- Add patch to support projects in the current directory - -* Sun Nov 16 2014 Tom Hughes - 0.0.8-1 -- Update to 0.0.8 upstream release - -* Sat Nov 15 2014 Tom Hughes - 0.0.7-1 -- Initial build of 0.0.7 diff --git a/sources b/sources deleted file mode 100644 index 009b64a..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (kosmtik-0.0.17.tgz) = d8adbbcc5752d416570c82b5dd4e7f7abcf8e5ee4586a800d2b7382490da40ab6a74c1bc70a4dce589bade422ee93a46cb67a8ae21a6f7012b23fe377e7029cc