[uglify-js1] Fix scriptlets to run in the correct subpackages
Jamie Nguyen
jamielinux at fedoraproject.org
Sat May 10 14:19:34 UTC 2014
commit 2db34ac8bffac5b92cfeb0988403047e0af86621
Author: Jamie Nguyen <j at jamielinux.com>
Date: Sat May 10 15:04:02 2014 +0100
Fix scriptlets to run in the correct subpackages
uglify-js1.spec | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/uglify-js1.spec b/uglify-js1.spec
index 3b1dbee..758cf41 100644
--- a/uglify-js1.spec
+++ b/uglify-js1.spec
@@ -5,7 +5,7 @@
Name: uglify-js1
Version: 1.3.4
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: JavaScript parser, mangler/compressor and beautifier toolkit
BuildArch: noarch
@@ -25,7 +25,7 @@ BuildRequires: web-assets-devel
BuildRequires: npm(nodeunit)
%endif
-Requires: js-uglify-1 == %{version}-%{release}
+Requires: js-uglify-1 = %{version}-%{release}
%description
JavaScript parser, mangler/compressor and beautifier toolkit. This is the
@@ -52,12 +52,15 @@ in the uglify-js package.
This package ships a JavaScript library suitable for use by any JavaScript
runtime.
+
%prep
%setup -q -n package
+
%build
#nothing to do
+
%install
rm -rf %buildroot
@@ -82,26 +85,31 @@ ln -sf ../lib/node_modules/uglify-js1/bin/uglifyjs %{buildroot}%{_bindir}/uglify
#nodejs-symlink-deps is not called because this package does not have any
#dependencies and can be used outside of node
+
%if 0%{?enable_tests}
%check
%nodejs_symlink_deps --check
nodeunit test/unit/scripts.js && test/testparser.js && test/testconsolidator.js
%endif
+
%clean
rm -rf %buildroot
+
%pretrans -p <lua>
st = posix.stat("%{nodejs_sitelib}/uglify-js1")
if st and st.type == "directory" then
os.execute("rm -rf %{nodejs_sitelib}/uglify-js1")
end
+%pretrans -n js-uglify-1 -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 at 1
@@ -115,6 +123,9 @@ end
%doc README.html README.org docstyle.css
%changelog
+* Sat May 10 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 1.3.4-7
+- fix scriptlets to run in the correct subpackages
+
* Mon Jan 20 2014 T.C. Hollingsworth <tchollingsworth at gmail.com> - 1.3.4-6
- fix Requires on js-uglify-1 subpackage
More information about the scm-commits
mailing list