diff --git a/.gitignore b/.gitignore index 5cfb1dd..f9c0211 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ /buble-0.16.0.tgz /tests-0.16.0.tar.bz2 -/buble-0.20.0-nm-prod.tgz -/buble-0.20.0.tgz -/tests-0.20.0.tar.bz2 diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..5454a14 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2016 Rich Harris and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/buble-0.20.0-bundled-licenses.txt b/buble-0.20.0-bundled-licenses.txt deleted file mode 100644 index b3b5a10..0000000 --- a/buble-0.20.0-bundled-licenses.txt +++ /dev/null @@ -1,2 +0,0 @@ -"BSD-2-Clause" -"MIT" diff --git a/nodejs-buble.spec b/nodejs-buble.spec index 50ac9bd..337ec5d 100644 --- a/nodejs-buble.spec +++ b/nodejs-buble.spec @@ -1,31 +1,48 @@ -%global npm_name buble +%{?nodejs_find_provides_and_requires} -# Several tests are currently failing for an unknown reason +%global packagename buble + +# We need to use bootstrap buble to be able to build acorn, but +# buble needs acorn to build from source and to run the tests. +# So we'll use the pre-compiled version for now, and then later +# rebuild from original sources once acorn is ready +%global bootstrap 1 + +%if 0%{?boostrap} %global enable_tests 0 +%endif Name: nodejs-buble -Version: 0.20.0 -Release: 12%{?dist} +Version: 0.16.0 +Release: 2%{?dist} Summary: The blazing fast, batteries-included ES2015 compiler License: MIT URL: https://gitlab.com/Rich-Harris/buble -Source0: https://registry.npmjs.org/%{npm_name}/-/%{npm_name}-%{version}.tgz +Source0: https://registry.npmjs.org/%{packagename}/-/%{packagename}-%{version}.tgz # The test files are not included in the npm tarball. # Source{1-9} are generated by running Source10, which pulls from the upstream # version control repository. Source1: tests-%{version}.tar.bz2 -Source2: %{npm_name}-%{version}-nm-prod.tgz -Source4: %{npm_name}-%{version}-bundled-licenses.txt Source10: dl-tests.sh # Config file for rollup Source11: https://gitlab.com/Rich-Harris/buble/raw/master/rollup.config.js +Source12: https://gitlab.com/Rich-Harris/buble/raw/master/LICENSE.md BuildArch: noarch +%if 0%{?fedora} >= 19 ExclusiveArch: %{nodejs_arches} noarch +%else +ExclusiveArch: %{ix86} x86_64 %{arm} noarch +%endif -BuildRequires: nodejs-devel +BuildRequires: nodejs-packaging +BuildRequires: npm(magic-string) + +%if 0%{?enable_tests} +BuildRequires: mocha +%endif %description The blazing fast, batteries-included ES2015 compiler @@ -36,38 +53,40 @@ The blazing fast, batteries-included ES2015 compiler # setup the tests %autosetup -T -D -a 1 -n package cp -p %{SOURCE11} . +cp -p %{SOURCE12} . #fix script interpreter sed -i '1s/env //' bin/buble -cp %{SOURCE4} . -# Setup bundled runtime(prod) node modules -tar xfz %{SOURCE2} -mkdir -p node_modules -pushd node_modules -ln -s ../node_modules_prod/* . -ln -s ../node_modules_prod/.bin . -popd - +%nodejs_fixdep acorn +%nodejs_fixdep acorn-jsx +%nodejs_fixdep magic-string %build +%if 0%{?bootstrap} # nothing to do +%else +# build from source +%endif %install -mkdir -p %{buildroot}%{nodejs_sitelib}/%{npm_name} +mkdir -p %{buildroot}%{nodejs_sitelib}/%{packagename} cp -pr package.json *.js bin/ dist/ \ - %{buildroot}%{nodejs_sitelib}/%{npm_name} -# Copy over bundled nodejs modules -cp -pr node_modules node_modules_prod \ - %{buildroot}%{nodejs_sitelib}/%{npm_name} + %{buildroot}%{nodejs_sitelib}/%{packagename} mkdir %{buildroot}%{_bindir} -ln -sf %{nodejs_sitelib}/%{npm_name}/bin/%{npm_name} \ - %{buildroot}%{_bindir}/%{npm_name} +ln -sf %{nodejs_sitelib}/%{packagename}/bin/%{packagename} \ + %{buildroot}%{_bindir}/%{packagename} + +%nodejs_symlink_deps %check %nodejs_symlink_deps --check +%if 0%{?bootstrap} +# nothing +%else %{__nodejs} -e 'require("./")' +%endif %if 0%{?enable_tests} NODE_ENV=test %{_bindir}/mocha -R spec %else @@ -77,63 +96,11 @@ NODE_ENV=test %{_bindir}/mocha -R spec %files %{!?_licensedir:%global license %doc} %doc *.md -%license LICENSE.md %{npm_name}-%{version}-bundled-licenses.txt -%{nodejs_sitelib}/%{npm_name} -%{_bindir}/%{npm_name} +%license LICENSE.md +%{nodejs_sitelib}/%{packagename} +%{_bindir}/%{packagename} %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 0.20.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 0.20.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 0.20.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 0.20.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.20.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 0.20.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 0.20.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 0.20.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.20.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0.20.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0.20.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 14 2021 Troy Dawson - 0.20.0-1 -- Update to 0.20.0 -- Bundle runtime (prod) dependencies - -* Tue Jul 28 2020 Fedora Release Engineering - 0.16.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 0.16.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 0.16.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0.16.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 0.16.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - * Thu Feb 08 2018 Fedora Release Engineering - 0.16.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 129ade8..5381e9f 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (buble-0.20.0-nm-prod.tgz) = 254329fc33ff4c20cf11c4ceff402d794ddac00f61ce220b54d443ab5d519cad53cce0642faea8103be78e2447b8d8a0ac5f304e835163b1755c49074a7957b6 -SHA512 (buble-0.20.0.tgz) = ff582768c404f31bdde6ab0d065fa24eeca327d5f179a57100c17ce9d438132c4524e66db20392f116beed61e06536a6e48143b6de0182e374b07d2d5532ab3b -SHA512 (tests-0.20.0.tar.bz2) = afeab7e97cedbb6613bbebcf32e9687b0b6c783335e1137b9babe6859e2d7135b9c52cdf506a5689f344aef46e6a391861a202cd836b58491f82ee0f0cd2eff8 +SHA512 (buble-0.16.0.tgz) = 11be6fb75f88bd75cfc980f5208408b9a07022e24e496436917cd42e583923cdda2c6176ab3723454da3a18bac9d616001e9ef27dc5338cbd9bd3d1b6fc04b6e +SHA512 (tests-0.16.0.tar.bz2) = db98ea5fd2c71b5a793d253bc1e09fae5e1b71141caa23b27f9c0d2b273601f004899f96d2bd9b0ff4f667f491c730a26997d2993663168d7c552a2f82dada9d