Merge branch 'master' into f19

uglify-js.spec

@@ -11,7 +11,7 @@
 
 Name:           uglify-js
 Version:        2.4.13
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        JavaScript parser, mangler/compressor and beautifier toolkit
 BuildArch:      noarch
 
@@ -102,7 +102,7 @@ ln -sf uglify-js@2 %{buildroot}%{nodejs_sitelib}/uglify-js
 %clean
 rm -rf %buildroot
 
-%pretrans -p <lua>
+%pretrans -n js-uglify -p <lua>
 st = posix.stat("%{nodejs_sitelib}/uglify-js")
 if st and st.type == "directory" then
   os.execute("rm -rf %{nodejs_sitelib}/uglify-js")
@@ -128,6 +128,9 @@ end
 
 
 %changelog
+* Tue Apr 01 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 2.4.13-3
+- pretrans script should run in js-uglify subpackage (#1082946)
+
 * Sat Mar 15 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 2.4.13-2
 - add logic for building on EPEL 6 as web-assets-{devel,filesystem} are not
   yet available