[uglify-js1/el6: 2/3] use new multi-version packaging rules
T.C. Hollingsworth
patches at fedoraproject.org
Mon Jan 20 01:00:31 UTC 2014
commit dc01677ee959d83c6c36297ced16c188845e4bbb
Author: Tom Hughes <tom at compton.nu>
Date: Sun Jan 19 11:58:25 2014 +0000
use new multi-version packaging rules
uglify-js1.spec | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/uglify-js1.spec b/uglify-js1.spec
index 1ec13cc..4dfa49b 100644
--- a/uglify-js1.spec
+++ b/uglify-js1.spec
@@ -5,7 +5,7 @@
Name: uglify-js1
Version: 1.3.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: JavaScript parser, mangler/compressor and beautifier toolkit
BuildArch: noarch
@@ -15,8 +15,10 @@ License: BSD
URL: https://github.com/mishoo/UglifyJS
Source0: http://registry.npmjs.org/uglify-js/-/uglify-js-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+ExclusiveArch: %{nodejs_arches} noarch
-BuildRequires: nodejs-devel
+BuildRequires: nodejs-packaging
%if 0%{?enable_tests}
BuildRequires: npm(nodeunit)
@@ -56,9 +58,9 @@ rm -rf %buildroot
mkdir -p %{buildroot}%{_datadir}/%{name}
cp -pr lib/* %{buildroot}%{_datadir}/%{name}/
-mkdir -p %{buildroot}%{nodejs_sitelib}/%{name}
-cp -pr bin package.json uglify-js.js %{buildroot}%{nodejs_sitelib}/%{name}
-ln -sf %{_datadir}/%{name} %{buildroot}%{nodejs_sitelib}/%{name}/lib
+mkdir -p %{buildroot}%{nodejs_sitelib}/uglify-js at 1
+cp -pr bin package.json uglify-js.js %{buildroot}%{nodejs_sitelib}/uglify-js at 1
+ln -sf %{_datadir}/uglify-js at 1 %{buildroot}%{nodejs_sitelib}/uglify-js at 1/lib
mkdir -p %{buildroot}%{_bindir}
ln -sf ../lib/node_modules/uglify-js1/bin/uglifyjs %{buildroot}%{_bindir}/uglifyjs1
@@ -68,6 +70,7 @@ ln -sf ../lib/node_modules/uglify-js1/bin/uglifyjs %{buildroot}%{_bindir}/uglify
%if 0%{?enable_tests}
%check
+%nodejs_symlink_deps --check
nodeunit test/unit/scripts.js && test/testparser.js && test/testconsolidator.js
%endif
@@ -76,7 +79,7 @@ rm -rf %buildroot
%files
%defattr(-,root,root,-)
-%{nodejs_sitelib}/%{name}
+%{nodejs_sitelib}/uglify-js at 1
%{_bindir}/uglifyjs1
%files common
@@ -85,6 +88,10 @@ rm -rf %buildroot
%doc README.html README.org docstyle.css
%changelog
+* Sun Jan 19 2014 Tom Hughes <tom at compton.nu> - 1.3.4-3
+- use new multi-version packaging rules
+- update to latest nodejs packaging standards
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list