From b18dfc735d6b1ec2f682534ea8598ccfe9146428 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Feb 10 2016 18:23:22 +0000
Subject: Update to 2.6.1 upstream release


---

diff --git a/.gitignore b/.gitignore
index 5d76d78..52047e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /uglify-js-2.2.4.tgz
 /uglify-js-2.2.5.tgz
 /uglify-js-2.4.13.tgz
+/uglify-js-2.6.1.tar.gz
diff --git a/sources b/sources
index 37edd86..e7ee016 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e9cce2a24532872a1f6816145d65c414  uglify-js-2.4.13.tgz
+4f6887f23b03ef752a89e50c3208bbe5  uglify-js-2.6.1.tar.gz
diff --git a/uglify-js-esfuzz.patch b/uglify-js-esfuzz.patch
new file mode 100644
index 0000000..cb06e28
--- /dev/null
+++ b/uglify-js-esfuzz.patch
@@ -0,0 +1,23 @@
+commit 2c6570391beeda550f86500e3f7c6eaa992a05b7
+Author: Tom Hughes <tom@compton.nu>
+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 07d9997..736449d 100644
--- a/uglify-js.spec
+++ b/uglify-js.spec
@@ -10,23 +10,22 @@
 %endif
 
 Name:           uglify-js
-Version:        2.4.13
-Release:        9%{?dist}
+Version:        2.6.1
+Release:        1%{?dist}
 Summary:        JavaScript parser, mangler/compressor and beautifier toolkit
 BuildArch:      noarch
 
 Group:          Development/Tools
-#no license file included; BSD license in source header
 License:        BSD
 URL:            https://github.com/mishoo/UglifyJS2
-Source0:        http://registry.npmjs.org/uglify-js/-/uglify-js-%{version}.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        https://github.com/mishoo/UglifyJS2/archive/v%{version}/uglify-js-%{version}.tar.gz
+Patch0:         uglify-js-esfuzz.patch
 
 BuildArch:  noarch
 %if 0%{?fedora} >= 19
-ExclusiveArch: %{nodejs_arches} noarch
+ExclusiveArch:  %{nodejs_arches} noarch
 %else
-ExclusiveArch: %{ix86} x86_64 %{arm} noarch
+ExclusiveArch:  %{ix86} x86_64 %{arm} noarch
 %endif
 
 Provides:       nodejs-uglify-js = %{version}-%{release}
@@ -69,14 +68,16 @@ This package ships a JavaScript library suitable for use by any JavaScript
 runtime.
 
 %prep
-%setup -q -n package
+%autosetup -p 1 -n UglifyJS2-%{version}
 
 %nodejs_fixdep async "^1.5.0"
-%nodejs_fixdep optimist "0.4.x"
+%nodejs_fixdep yargs "^3.2.1"
+
 
 %build
 #nothing to do
 
+
 %install
 rm -rf %buildroot
 
@@ -99,14 +100,13 @@ ln -sf ../lib/node_modules/uglify-js@2/bin/uglifyjs %{buildroot}%{_bindir}/uglif
 
 ln -sf uglify-js@2 %{buildroot}%{nodejs_sitelib}/uglify-js
 
+
 %if 0%{?enable_tests}
 %check
 %nodejs_symlink_deps --check
 %__nodejs test/run-tests.js
 %endif
 
-%clean
-rm -rf %buildroot
 
 %pretrans -p <lua>
 st = posix.stat("%{nodejs_sitelib}/uglify-js")
@@ -114,27 +114,34 @@ if st and st.type == "directory" then
   os.execute("rm -rf %{nodejs_sitelib}/uglify-js")
 end
 
+
 %pretrans -n js-uglify -p <lua>
 st = posix.stat("%{_datadir}/%{name}")
 if st and st.type == "directory" then
   os.execute("rm -rf %{_datadir}/%{name}")
 end
 
+
 %files
 %defattr(-,root,root,-)
 %{nodejs_sitelib}/uglify-js
 %{nodejs_sitelib}/uglify-js@2
 %{_bindir}/uglifyjs
 
+
 %files -n js-uglify
 %defattr(-,root,root,-)
 %{installdir}/%{name}-2
 %{installdir}/%{name}
 %{_datadir}/%{name}
-%doc LICENSE README.md
+%doc README.md
+%license LICENSE
 
 
 %changelog
+* Wed Feb 10 2016 Tom Hughes <tom@compton.nu> - 2.6.1-1
+- Update to 2.6.1 upstream release
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.13-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild