[nodejs-underscore/epel7: 6/6] Merge branch 'master' into epel7

[T.C. Hollingsworth]

commit c86c508bb237a54fabc223a3929da07f0fc8ce2e
Merge: 2939927 758a069
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Jul 29 03:03:24 2014 -0700

    Merge branch 'master' into epel7
    
    Conflicts:
    	nodejs-underscore.spec

 .gitignore             |    2 +
 dl-tests.sh            |    2 +-
 nodejs-underscore.spec |   55 ++++++++++++++++++++++++++++++++++++++---------
 sources                |    4 +-
 4 files changed, 49 insertions(+), 14 deletions(-)
---
diff --cc nodejs-underscore.spec
index 56b5569,5efa987..b099a01
--- a/nodejs-underscore.spec
+++ b/nodejs-underscore.spec
@@@ -77,13 -97,23 +97,26 @@@ cp -pr underscore.js underscore-min.js 
  %{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 at lists.fedoraproject.org> - 1.6.0-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+ * Thu May 08 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 1.6.0-3
+ - depend explicitly on latest version of uglifyjs
+ 
+ * Sat Apr 26 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 1.6.0-2
+ - add jsdir logic for EL6
+ 
+ * Fri Apr 18 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 1.6.0-1
+ - update to upstream release 1.6.0
+ 
 +* Thu May 08 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 1.5.1-3
 +- depend explicitly on latest version of uglifyjs
 +
  * Sun Jan 19 2014 T.C. Hollingsworth <tchollingsworth at gmail.com> - 1.5.1-2
  - ship a browser version
  - add missing BuildRequires on uglify-js