From 9a5b9b002d50ba70223938342e595cf2a735dcea Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Mon, 10 Jun 2024 21:05:24 +0200
Subject: [PATCH] Update to 3.18.0

---
 sources        |  2 +-
 uglify-js.spec | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/sources b/sources
index e33617c..245c243 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (uglify-js-3.17.4.tgz) = 4fdabcd93248f5efc2d5303162f7dbd7ac4ed76d2d315159ac60377fdfcfe38db80cdbbaca92b5d37cb418f1556b5ef2a2dc12c995b98985e08d81e41ab256fe
+SHA512 (uglify-js-3.18.0.tgz) = 4b25556dc3410a4d1dcebf572ff47fc92ae661fd2cdfbd8aebf845925ce0729da5045c97b70e08ec139d0e394b844d5a56a688fd21d65d6998765671bb2177f0
diff --git a/uglify-js.spec b/uglify-js.spec
index 738fc5c..75a75c2 100644
--- a/uglify-js.spec
+++ b/uglify-js.spec
@@ -4,8 +4,8 @@
 %bcond_with tests
 
 Name:           uglify-js
-Version:        3.17.4
-Release:        3%{?dist}
+Version:        3.18.0
+Release:        1%{?dist}
 Summary:        JavaScript parser, mangler/compressor and beautifier toolkit
 License:        BSD-2-Clause
 URL:            https://github.com/mishoo/UglifyJS
@@ -67,27 +67,29 @@ chmod 0755 bin/uglifyjs
 %install
 mkdir -p %{buildroot}%{_jsdir}/%{name}-3
 cp -pr lib/* %{buildroot}%{_jsdir}/%{name}-3
-ln -sf %{name}-3 %{buildroot}%{_jsdir}/%{name}
+ln -s %{name}-3 %{buildroot}%{_jsdir}/%{name}
 
 #compat symlink
 mkdir -p %{buildroot}%{_datadir}
-ln -sf javascript/%{name} %{buildroot}%{_datadir}/%{name}
+ln -rs %{buildroot}%{_jsdir}/%{name} %{buildroot}%{_datadir}/%{name}
 
 mkdir -p %{buildroot}%{nodejs_sitelib}/uglify-js@3
 cp -pr bin tools package.json %{buildroot}%{nodejs_sitelib}/uglify-js@3
-ln -sf %{_jsdir}/%{name}-3 %{buildroot}%{nodejs_sitelib}/uglify-js@3/lib
+ln -rs %{buildroot}%{_jsdir}/%{name}-3 \
+       %{buildroot}%{nodejs_sitelib}/uglify-js@3/lib
 # Fix for rpmlint.
 sed -i -e 's|^#! */usr/bin/env node|#!/usr/bin/node|' \
-  %{buildroot}%{nodejs_sitelib}/uglify-js@3/bin/*
+  %{buildroot}%{nodejs_sitelib}/uglify-js@3/bin/uglifyjs
 chmod 755 %{buildroot}%{nodejs_sitelib}/uglify-js@3/bin/uglifyjs
 
 mkdir -p %{buildroot}%{_bindir}
-ln -sf ../lib/$(basename %{nodejs_sitelib})/uglify-js@3/bin/uglifyjs %{buildroot}%{_bindir}/uglifyjs-3
-ln -sf uglifyjs-3 %{buildroot}%{_bindir}/uglifyjs
+ln -rs %{buildroot}%{nodejs_sitelib}/uglify-js@3/bin/uglifyjs \
+       %{buildroot}%{_bindir}/uglifyjs-3
+ln -s uglifyjs-3 %{buildroot}%{_bindir}/uglifyjs
 
 %nodejs_symlink_deps
 
-ln -sf uglify-js@3 %{buildroot}%{nodejs_sitelib}/uglify-js
+ln -s uglify-js@3 %{buildroot}%{nodejs_sitelib}/uglify-js
 
 
 %check
@@ -132,6 +134,9 @@ end
 
 
 %changelog
+* Mon Jun 10 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.18.0-1
+- Update to 3.18.0
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild