Merge branch 'master' into epel7

Conflicts:
	nodejs-underscore.spec

.gitignore

@@ -2,3 +2,5 @@
 /underscore-1.4.4.tgz
 /tests-1.5.1.tar.bz2
 /underscore-1.5.1.tgz
+/tests-1.6.0.tar.bz2
+/underscore-1.6.0.tgz

dl-tests.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-tag=1.5.1
+tag=1.6.0
 
 set -e
 

nodejs-underscore.spec

@@ -1,10 +1,18 @@
 %{?nodejs_find_provides_and_requires}
 
+# NOTE TO SELF: Do not update on Fedora <= 20.
+
 %global enable_tests 0
 
+%if 0%{?fedora}
+%global installdir  %{_jsdir}/underscore
+%else
+%global installdir  %{_datadir}/javascript/underscore
+%endif
+
 Name:       nodejs-underscore
-Version:    1.5.1
-Release:    3%{?dist}
+Version:    1.6.0
+Release:    4%{?dist}
 Summary:    JavaScript's functional programming helper library
 License:    MIT
 Group:      System Environment/Libraries
@@ -15,10 +23,19 @@ Source0:    http://registry.npmjs.org/underscore/-/underscore-%{version}.tgz
 # version control repository.
 Source1:    tests-%{version}.tar.bz2
 Source10:   dl-tests.sh
+
 BuildArch:  noarch
+%if 0%{?fedora} >= 19
+ExclusiveArch: %{nodejs_arches} noarch
+%else
+ExclusiveArch: %{ix86} x86_64 %{arm} noarch
+%endif
+
+%if 0%{?fedora}
+BuildRequires:  web-assets-devel
+%endif
 
 BuildRequires:  nodejs-packaging
-BuildRequires:  web-assets-devel
 BuildRequires:  uglify-js
 
 %if 0%{?enable_tests}
@@ -33,7 +50,9 @@ extending any core JavaScript objects.
 %package -n js-underscore
 Summary:    JavaScript's functional programming helper library
 Group:      System Environment/Libraries
+%if 0%{?fedora}
 Requires:   web-assets-filesystem
+%endif
 
 %description -n js-underscore
 Underscore.js is a utility-belt library for JavaScript that provides support
@@ -47,18 +66,19 @@ rm -f underscore-min.*
 
 
 %build
-uglifyjs underscore.js -m --source-map underscore-min.map -o underscore-min.js
+/usr/bin/uglifyjs underscore.js -m --source-map underscore-min.map \
+    -o underscore-min.js
 
 
 %install
 mkdir -p %{buildroot}%{nodejs_sitelib}/underscore
-cp -pr package.json index.js underscore.js underscore-min.js underscore-min.map \
+cp -pr package.json underscore.js underscore-min.js underscore-min.map \
     %{buildroot}%{nodejs_sitelib}/underscore
 
-#install browser version
-mkdir -p %{buildroot}%{_jsdir}/underscore
+# Install browser version
+mkdir -p %{buildroot}%{installdir}
 cp -pr underscore.js underscore-min.js underscore-min.map \
-    %{buildroot}%{_jsdir}/underscore
+    %{buildroot}%{installdir}
 
 # No dependencies.
 # %%nodejs_symlink_deps
@@ -73,14 +93,27 @@ cp -pr underscore.js underscore-min.js underscore-min.map \
 
 
 %files
-%doc CONTRIBUTING.md LICENSE README.md
+%doc LICENSE README.md
 %{nodejs_sitelib}/underscore
 
 %files -n js-underscore
-%doc CONTRIBUTING.md LICENSE README.md
-%{_jsdir}/underscore
+%doc LICENSE README.md
+%{installdir}
+
 
 %changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu May 08 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1.6.0-3
+- depend explicitly on latest version of uglifyjs
+
+* Sat Apr 26 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1.6.0-2
+- add jsdir logic for EL6
+
+* Fri Apr 18 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1.6.0-1
+- update to upstream release 1.6.0
+
 * Thu May 08 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1.5.1-3
 - depend explicitly on latest version of uglifyjs
 

sources

@@ -1,2 +1,2 @@
-bb44857865aa035a67375b13381eedb3  tests-1.5.1.tar.bz2
-8c4cc09e37517dc6b387d3ca00c6b593  underscore-1.5.1.tgz
+d98b3849b5abd0e531b160173cb175b1  tests-1.6.0.tar.bz2
+563b1d9f13887d4bdcb6b06270a54825  underscore-1.6.0.tgz