Merge branch 'master' into f19

uglify-js.spec

@@ -11,7 +11,7 @@
 
 Name:           uglify-js
 Version:        2.4.13
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        JavaScript parser, mangler/compressor and beautifier toolkit
 BuildArch:      noarch
 
@@ -102,12 +102,13 @@ ln -sf uglify-js@2 %{buildroot}%{nodejs_sitelib}/uglify-js
 %clean
 rm -rf %buildroot
 
-%pretrans -n js-uglify -p <lua>
+%pretrans -p <lua>
 st = posix.stat("%{nodejs_sitelib}/uglify-js")
 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}")
@@ -128,6 +129,10 @@ end
 
 
 %changelog
+* Tue Apr 29 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 2.4.13-4
+- pretrans script should actually be split in two, so one half should run in
+  uglify-js and the other half should run in js-uglify (#1092184)
+
 * Tue Apr 01 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 2.4.13-3
 - pretrans script should run in js-uglify subpackage (#1082946)