diff --git a/.gitignore b/.gitignore index 7a84f66..30b4245 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,17 @@ /underscore-1.4.4.tgz /tests-1.5.1.tar.bz2 /underscore-1.5.1.tgz +/tests-1.6.0.tar.bz2 +/underscore-1.6.0.tgz +/tests-1.8.3.tar.bz2 +/underscore-1.8.3.tgz +/underscore-1.9.0.tgz +/tests-1.9.0.tar.bz2 +/underscore-1.9.1.tgz +/tests-1.9.1.tar.bz2 +/underscore-1.10.2.tgz +/tests-1.10.2.tar.bz2 +/underscore-1.12.0.tgz +/tests-1.12.0.tar.bz2 +/underscore-1.13.1.tgz +/tests-1.13.1.tar.bz2 diff --git a/dl-tests.sh b/dl-tests.sh old mode 100644 new mode 100755 index 69de284..4b210fd --- a/dl-tests.sh +++ b/dl-tests.sh @@ -1,6 +1,6 @@ #!/bin/bash -tag=1.5.1 +tag=1.13.1 set -e @@ -16,7 +16,7 @@ unset CDPATH pwd=$(pwd) pushd "$tmp" -git clone git://github.com/documentcloud/underscore.git +git clone git://github.com/jashkenas/underscore.git cd underscore git archive --prefix="test/" --format=tar tags/${tag}:test/ \ | bzip2 > "$pwd"/tests-${tag}.tar.bz2 diff --git a/nodejs-underscore.spec b/nodejs-underscore.spec index 22da938..01f5bec 100644 --- a/nodejs-underscore.spec +++ b/nodejs-underscore.spec @@ -2,24 +2,38 @@ %global enable_tests 0 +%if 0%{?fedora} +%global installdir %{_jsdir}/underscore +%else +%global installdir %{_datadir}/javascript/underscore +%endif + Name: nodejs-underscore -Version: 1.5.1 -Release: 2%{?dist} +Version: 1.13.1 +Release: 12%{?dist} Summary: JavaScript's functional programming helper library License: MIT -Group: System Environment/Libraries -URL: https://github.com/documentcloud/underscore +URL: http://underscorejs.org/ Source0: http://registry.npmjs.org/underscore/-/underscore-%{version}.tgz # The test files are not included in the npm tarball. # Source1 is generated by running Source10, which pulls from the upstream # version control repository. Source1: tests-%{version}.tar.bz2 Source10: dl-tests.sh + BuildArch: noarch +%if 0%{?fedora} >= 19 +ExclusiveArch: %{nodejs_arches} noarch +%else +ExclusiveArch: %{ix86} x86_64 %{arm} noarch +%endif + +%if 0%{?fedora} +BuildRequires: web-assets-devel +%endif BuildRequires: nodejs-packaging -BuildRequires: web-assets-devel -BuildRequires: npm(uglify-js) +BuildRequires: uglify-js %if 0%{?enable_tests} BuildRequires: npm(phantomjs) @@ -32,8 +46,9 @@ extending any core JavaScript objects. %package -n js-underscore Summary: JavaScript's functional programming helper library -Group: System Environment/Libraries +%if 0%{?fedora} Requires: web-assets-filesystem +%endif %description -n js-underscore Underscore.js is a utility-belt library for JavaScript that provides support @@ -47,18 +62,18 @@ rm -f underscore-min.* %build -uglifyjs underscore.js -m --source-map underscore-min.map -o underscore-min.js +/usr/bin/uglifyjs underscore.js -m --source-map -o underscore-min.js %install mkdir -p %{buildroot}%{nodejs_sitelib}/underscore -cp -pr package.json index.js underscore.js underscore-min.js underscore-min.map \ +cp -pr package.json underscore*.js underscore*.cjs underscore*.map \ %{buildroot}%{nodejs_sitelib}/underscore -#install browser version -mkdir -p %{buildroot}%{_jsdir}/underscore -cp -pr underscore.js underscore-min.js underscore-min.map \ - %{buildroot}%{_jsdir}/underscore +# Install browser version +mkdir -p %{buildroot}%{installdir} +cp -pr underscore.js underscore-min.js underscore-min.js.map \ + %{buildroot}%{installdir} # No dependencies. # %%nodejs_symlink_deps @@ -73,14 +88,115 @@ cp -pr underscore.js underscore-min.js underscore-min.map \ %files -%doc CONTRIBUTING.md LICENSE README.md +%doc LICENSE README.md %{nodejs_sitelib}/underscore %files -n js-underscore -%doc CONTRIBUTING.md LICENSE README.md -%{_jsdir}/underscore +%doc LICENSE README.md +%{installdir} + %changelog +* Tue Nov 11 2025 Tomas Juhasz - 1.13.1-12 +- Rebuilt for nodejs-packaging + +* Thu Jul 24 2025 Fedora Release Engineering - 1.13.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 17 2025 Fedora Release Engineering - 1.13.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 18 2024 Fedora Release Engineering - 1.13.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.13.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.13.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.13.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.13.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jan 13 2023 Mamoru TASAKA - 1.13.1-4 +- Install additional scripts to satisfy dependency (bug 2123435) + +* Fri Jul 22 2022 Fedora Release Engineering - 1.13.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sun Aug 15 2021 Dan Callaghan - 1.13.1-1 +- upstream release 1.13.1, including fix for CVE-2021-23358 + +* Thu Jul 22 2021 Fedora Release Engineering - 1.12.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Dan Callaghan - 1.12.0-1 +- upstream release 1.12.0 + +* Sat Aug 01 2020 Fedora Release Engineering - 1.10.2-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.10.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jun 13 2020 Dan Callaghan - 1.10.2-1 +- upstream release 1.10.2 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.9.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 04 2018 Dan Callaghan - 1.9.1-1 +- upstream release 1.9.1 + +* Mon Apr 30 2018 Dan Callaghan - 1.9.0-1 +- upstream release 1.9.0 + +* Thu Feb 08 2018 Fedora Release Engineering - 1.8.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.8.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Sep 03 2015 Dan Callaghan - 1.8.3-1 +- update to upstream release 1.8.3 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.6.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 08 2014 Jamie Nguyen - 1.6.0-3 +- depend explicitly on latest version of uglifyjs + +* Sat Apr 26 2014 Jamie Nguyen - 1.6.0-2 +- add jsdir logic for EL6 + +* Fri Apr 18 2014 Jamie Nguyen - 1.6.0-1 +- update to upstream release 1.6.0 + * Sun Jan 19 2014 T.C. Hollingsworth - 1.5.1-2 - ship a browser version - add missing BuildRequires on uglify-js diff --git a/sources b/sources index b2cee61..597f9ba 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -bb44857865aa035a67375b13381eedb3 tests-1.5.1.tar.bz2 -8c4cc09e37517dc6b387d3ca00c6b593 underscore-1.5.1.tgz +SHA512 (underscore-1.13.1.tgz) = 8734a8015b4917edd9b62157d1581f14f1c40d19bb63f40f8c6c8da384d57670d375fb77b6bf211240f6e5ad630be4e34ee13bb641c62a48700a0b3d760041da +SHA512 (tests-1.13.1.tar.bz2) = 312bac7379b7c2c5f7ef7f691613c840463708ce12ebc3ff0932244c262afca39fafa39b0e2e1ae5388f4a85d882c2c5ca172520f82cd916be90bd6ef374ae74