diff --git a/skip-identifier-with-test.patch b/skip-identifier-with-test.patch deleted file mode 100644 index 2ee07348c78f9c44378a28cb5078f5ff8501a4ad..0000000000000000000000000000000000000000 --- a/skip-identifier-with-test.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- UglifyJS2-2.8.22/test/compress/issue-1770.js 2017-04-09 11:36:57.000000000 +0800 -+++ UglifyJS2-2.8.22/test/compress/issue-1770.js 2024-04-17 09:32:41.842653051 +0800 -@@ -168,7 +168,6 @@ - var: 58, - void: 59, - while: 60, -- with: 61, - }; - } - expect: { -@@ -233,7 +232,6 @@ - ba: 58, - ca: 59, - da: 60, -- ea: 61, - }; - } - } diff --git a/uglify-js-2.8.22.tar.gz b/uglify-js-2.8.22.tar.gz deleted file mode 100644 index ef16b5b79ab81da341807c8213f72da65748901f..0000000000000000000000000000000000000000 Binary files a/uglify-js-2.8.22.tar.gz and /dev/null differ diff --git a/uglify-js-3.19.3.tar.gz b/uglify-js-3.19.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..7d8670e758229f8b5121fe03573c8f199328465a Binary files /dev/null and b/uglify-js-3.19.3.tar.gz differ diff --git a/uglify-js-esfuzz.patch b/uglify-js-esfuzz.patch deleted file mode 100644 index cb06e287df0aad2fbfd8260d78432ca7a0f202c6..0000000000000000000000000000000000000000 --- a/uglify-js-esfuzz.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 2c6570391beeda550f86500e3f7c6eaa992a05b7 -Author: Tom Hughes -Date: Wed Feb 10 18:16:53 2016 +0000 - - Patch out tests that require esfuzz - -diff --git a/test/run-tests.js b/test/run-tests.js -index 3ec04fd..96c0613 100755 ---- a/test/run-tests.js -+++ b/test/run-tests.js -@@ -19,12 +19,6 @@ if (failures) { - var run_sourcemaps_tests = require('./sourcemaps'); - run_sourcemaps_tests(); - --var run_ast_conversion_tests = require("./mozilla-ast"); -- --run_ast_conversion_tests({ -- iterations: 1000 --}); -- - /* -----[ utils ]----- */ - - function tmpl() { diff --git a/uglify-js.spec b/uglify-js.spec index d9d642fb2061dffc281b847b8d171253647538fc..10b53dbbc8e78716b4b98b5511b753c9df29d4b8 100644 --- a/uglify-js.spec +++ b/uglify-js.spec @@ -1,18 +1,19 @@ %{?nodejs_find_provides_and_requires} -%global enable_tests 1 -%global installdir %{_jsdir} + +%global enable_tests 0 + Name: uglify-js -Version: 2.8.22 -Release: 2 +Version: 3.19.3 +Release: 1 Summary: JavaScript parser, mangler/compressor and beautifier toolkit -License: BSD -URL: https://github.com/mishoo/UglifyJS2 -Source0: https://github.com/mishoo/UglifyJS2/archive/v%{version}/uglify-js-%{version}.tar.gz -Patch0: uglify-js-esfuzz.patch -Patch1: skip-identifier-with-test.patch +License: BSD-2-Clause +URL: https://github.com/mishoo/UglifyJS +Source0: https://github.com/mishoo/UglifyJS/archive/v%{version}/uglify-js-%{version}.tar.gz BuildArch: noarch ExclusiveArch: %{nodejs_arches} noarch Provides: nodejs-uglify-js = %{version}-%{release} +Provides: uglify-js3 = %{version}-%{release} +Obsoletes: uglify-js3 < %{version}-%{release} BuildRequires: nodejs-packaging BuildRequires: web-assets-devel %if 0%{?enable_tests} @@ -26,8 +27,10 @@ use within Node.js. %package -n js-uglify Summary: JavaScript parser, mangler/compressor and beautifier toolkit - core library -Obsoletes: uglify-js-common < 2.2.5-4 +Provides: js-uglify3 = %{version}-%{release} +Obsoletes: js-uglify3 < %{version}-%{release} Provides: uglify-js-common = %{version}-%{release} +Obsoletes: uglify-js-common < 2.2.5-4 Requires: web-assets-filesystem %description -n js-uglify JavaScript parser, mangler/compressor and beautifier toolkit. @@ -35,28 +38,26 @@ This package ships a JavaScript library suitable for use by any JavaScript runtime. %prep -%autosetup -p 1 -n UglifyJS2-%{version} -%nodejs_fixdep async "^1.5.0" -%nodejs_fixdep yargs "^3.2.1" +%autosetup -p 1 -n UglifyJS-%{version} %build %install rm -rf %buildroot -mkdir -p %{buildroot}%{installdir}/%{name}-2 -cp -pr lib/* %{buildroot}%{installdir}/%{name}-2 -ln -sf %{name}-2 %{buildroot}%{installdir}/%{name} +mkdir -p %{buildroot}%{_jsdir}/%{name}-3 +cp -pr lib/* %{buildroot}%{_jsdir}/%{name}-3 +ln -sf %{name}-3 %{buildroot}%{_jsdir}/%{name} mkdir -p %{buildroot}%{_datadir} ln -sf javascript/%{name} %{buildroot}%{_datadir}/%{name} -mkdir -p %{buildroot}%{nodejs_sitelib}/uglify-js@2 -cp -pr bin tools package.json %{buildroot}%{nodejs_sitelib}/uglify-js@2 -ln -sf %{installdir}/%{name} %{buildroot}%{nodejs_sitelib}/uglify-js@2/lib +mkdir -p %{buildroot}%{nodejs_sitelib}/uglify-js@3 +cp -pr bin tools package.json %{buildroot}%{nodejs_sitelib}/uglify-js@3 +ln -sf %{_jsdir}/%{name} %{buildroot}%{nodejs_sitelib}/uglify-js@3/lib sed -i -e 's|^#! */usr/bin/env node|#!/usr/bin/node|' \ - %{buildroot}%{nodejs_sitelib}/uglify-js@2/bin/* + %{buildroot}%{nodejs_sitelib}/uglify-js@3/bin/* mkdir -p %{buildroot}%{_bindir} -ln -sf ../lib/node_modules/uglify-js@2/bin/uglifyjs %{buildroot}%{_bindir}/uglifyjs +ln -sf ../lib/node_modules/uglify-js@3/bin/uglifyjs %{buildroot}%{_bindir}/uglifyjs %nodejs_symlink_deps -ln -sf uglify-js@2 %{buildroot}%{nodejs_sitelib}/uglify-js +ln -sf uglify-js@3 %{buildroot}%{nodejs_sitelib}/uglify-js %check %nodejs_symlink_deps --check @@ -82,17 +83,20 @@ end %files %{nodejs_sitelib}/uglify-js -%{nodejs_sitelib}/uglify-js@2 +%{nodejs_sitelib}/uglify-js@3 %{_bindir}/uglifyjs %files -n js-uglify -%{installdir}/%{name}-2 -%{installdir}/%{name} +%{_jsdir}/%{name}-3 +%{_jsdir}/%{name} %{_datadir}/%{name} %doc README.md %license LICENSE %changelog +* Thu Jul 10 2025 wangkai <13474090681@163.com> - 3.19.3-1 +- Update to 3.19.3 + * Tue Apr 23 2024 wangkai <13474090681@163.com> - 2.8.22-2 - skip identifier with test for nodejs20 diff --git a/uglify-js.yaml b/uglify-js.yaml index 4e8b91e5b3c38ce75a1e92375b73257d698a2c6e..63e32a309e51c54efa2b8b4e98bf3a51667bbf9e 100644 --- a/uglify-js.yaml +++ b/uglify-js.yaml @@ -1,5 +1,4 @@ -git_url: https://github.com/mishoo/UglifyJS2 -version_control: github -src_repo: mishoo/UglifyJS2 -tag_prefix: "^v" -seperator: "." +version_control: github +src_repo: mishoo/UglifyJS +tag_prefix: "^v" +separator: "."