From e74accecbb9a4c19049e2cfaa5bb6ac51c8a820f Mon Sep 17 00:00:00 2001
From: Jamie Nguyen <j@jamielinux.com>
Date: May 08 2014 19:17:13 +0000
Subject: Merge branch 'master' into f19


---

diff --git a/uglify-js.spec b/uglify-js.spec
index 0a3e8ee..afc57de 100644
--- a/uglify-js.spec
+++ b/uglify-js.spec
@@ -11,7 +11,7 @@
 
 Name:           uglify-js
 Version:        2.4.13
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        JavaScript parser, mangler/compressor and beautifier toolkit
 BuildArch:      noarch
 
@@ -21,8 +21,13 @@ License:        BSD
 URL:            https://github.com/mishoo/UglifyJS2
 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
+
+BuildArch:  noarch
+%if 0%{?fedora} >= 19
+ExclusiveArch: %{nodejs_arches} noarch
+%else
+ExclusiveArch: %{ix86} x86_64 %{arm} noarch
+%endif
 
 Provides:       nodejs-uglify-js = %{version}-%{release}
 
@@ -129,6 +134,9 @@ end
 
 
 %changelog
+* Thu May 08 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 2.4.13-5
+- add logic for building on EL6
+
 * 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)