The package rpms/uglify-js.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/uglify-js.git/commit/?id=313e404d....
Change:
-ExclusiveArch: %{ix86} x86_64 %{arm} noarch
Thanks.
Full change:
============
commit bf4503b15e3490832eb5915d99ac4bbd1b71bf90
Author: Jan Stank <jstanek(a)redhat.com>
Date: Tue Jan 21 14:55:50 2020 +0100
Use %bcond_without for conditional compilation
diff --git a/uglify-js.spec b/uglify-js.spec
index aa52958..7df6a38 100644
--- a/uglify-js.spec
+++ b/uglify-js.spec
@@ -1,7 +1,7 @@
%{?nodejs_find_provides_and_requires}
#enable/disable tests in case the deps aren't there
-%global enable_tests 1
+%bcond_without tests
Name: uglify-js
Version: 2.8.22
@@ -20,7 +20,7 @@ Provides: nodejs-uglify-js = %{version}-%{release}
BuildRequires: nodejs-packaging
BuildRequires: web-assets-devel
-%if 0%{?enable_tests}
+%if %{with tests}
BuildRequires: npm(acorn)
BuildRequires: npm(async)
BuildRequires: npm(mocha)
@@ -92,7 +92,7 @@ ln -sf uglify-js@2 %{buildroot}%{nodejs_sitelib}/uglify-js
%check
%nodejs_symlink_deps --check
%{__nodejs} -e 'require("./")'
-%if 0%{?enable_tests}
+%if %{with tests}
# Prevent timeout error on an ARM builder which is slower than the x86 builder.
sed -i '/timeout/ s/5000/10000/' test/mocha/cli.js
sed -i '/timeout/ s/10000/20000/' test/mocha/let.js
@@ -133,6 +133,7 @@ end
* Wed Jan 22 2020 Jan Stank <jstanek(a)redhat.com> - 2.8.22-8
- Remove unneeded legacy conditionals around %%{nodejs_arches} and %%{_jsdir}
- Disable colors in tests
+- Use %%bcond_without for conditional compilation
* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.22-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit ecacc806e3509527c2a2ae778b2a78266ade3617
Author: Jan Stank <jstanek(a)redhat.com>
Date: Wed Jan 22 17:27:33 2020 +0100
Disable colors in tests
diff --git a/uglify-js.spec b/uglify-js.spec
index 3415622..aa52958 100644
--- a/uglify-js.spec
+++ b/uglify-js.spec
@@ -97,7 +97,7 @@ ln -sf uglify-js@2 %{buildroot}%{nodejs_sitelib}/uglify-js
sed -i '/timeout/ s/5000/10000/' test/mocha/cli.js
sed -i '/timeout/ s/10000/20000/' test/mocha/let.js
sed -i '/timeout/ s/20000/40000/' test/mocha/spidermonkey.js
-%__nodejs test/run-tests.js
+NODE_DISABLE_COLORS=true %{__nodejs} test/run-tests.js
%endif
@@ -132,6 +132,7 @@ end
%changelog
* Wed Jan 22 2020 Jan Stank <jstanek(a)redhat.com> - 2.8.22-8
- Remove unneeded legacy conditionals around %%{nodejs_arches} and %%{_jsdir}
+- Disable colors in tests
* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.22-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit 313e404dc4611a1b5b465761b2c9dcb518c9b0a1
Author: Jan Stank <jstanek(a)redhat.com>
Date: Tue Jan 21 14:50:31 2020 +0100
Remove unneeded legacy conditionals around %{nodejs_arches} and %{_jsdir}
Signed-off-by: Jan Stank <jstanek(a)redhat.com>
diff --git a/uglify-js.spec b/uglify-js.spec
index 305f0bb..3415622 100644
--- a/uglify-js.spec
+++ b/uglify-js.spec
@@ -3,35 +3,22 @@
#enable/disable tests in case the deps aren't there
%global enable_tests 1
-%if 0%{?fedora}
-%global installdir %{_jsdir}
-%else
-%global installdir %{_datadir}/javascript
-%endif
-
Name: uglify-js
Version: 2.8.22
-Release: 7%{?dist}
+Release: 8%{?dist}
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-%{versi...
Patch0: uglify-js-esfuzz.patch
-BuildArch: noarch
-%if 0%{?fedora} >= 19
+BuildArch: noarch
ExclusiveArch: %{nodejs_arches} noarch
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm} noarch
-%endif
Provides: nodejs-uglify-js = %{version}-%{release}
BuildRequires: nodejs-packaging
-
-%if 0%{?fedora}
BuildRequires: web-assets-devel
-%endif
%if 0%{?enable_tests}
BuildRequires: npm(acorn)
@@ -79,9 +66,9 @@ runtime.
%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}-2
+cp -pr lib/* %{buildroot}%{_jsdir}/%{name}-2
+ln -sf %{name}-2 %{buildroot}%{_jsdir}/%{name}
#compat symlink
mkdir -p %{buildroot}%{_datadir}
@@ -89,7 +76,7 @@ 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
+ln -sf %{_jsdir}/%{name} %{buildroot}%{nodejs_sitelib}/uglify-js@2/lib
# Fix for rpmlint.
sed -i -e 's|^#! */usr/bin/env node|#!/usr/bin/node|' \
%{buildroot}%{nodejs_sitelib}/uglify-js@2/bin/*
@@ -135,14 +122,17 @@ end
%files -n js-uglify
-%{installdir}/%{name}-2
-%{installdir}/%{name}
+%{_jsdir}/%{name}-2
+%{_jsdir}/%{name}
%{_datadir}/%{name}
%doc README.md
%license LICENSE
%changelog
+* Wed Jan 22 2020 Jan Stank <jstanek(a)redhat.com> - 2.8.22-8
+- Remove unneeded legacy conditionals around %%{nodejs_arches} and %%{_jsdir}
+
* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.8.22-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild