From 160bed9037ad881fb4382824c7fec7e4487e5436 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Fri, 18 Apr 2014 22:07:10 +0100 Subject: [PATCH 1/5] Update to upstream release 1.6.0 --- .gitignore | 2 ++ dl-tests.sh | 2 +- nodejs-underscore.spec | 22 ++++++++++++++++------ sources | 4 ++-- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 7a84f66..e8af80e 100644 --- a/.gitignore +++ b/.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 diff --git a/dl-tests.sh b/dl-tests.sh index 69de284..eda1a89 100644 --- a/dl-tests.sh +++ b/dl-tests.sh @@ -1,6 +1,6 @@ #!/bin/bash -tag=1.5.1 +tag=1.6.0 set -e diff --git a/nodejs-underscore.spec b/nodejs-underscore.spec index 22da938..7685998 100644 --- a/nodejs-underscore.spec +++ b/nodejs-underscore.spec @@ -3,8 +3,8 @@ %global enable_tests 0 Name: nodejs-underscore -Version: 1.5.1 -Release: 2%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: JavaScript's functional programming helper library License: MIT Group: System Environment/Libraries @@ -15,7 +15,13 @@ 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 BuildRequires: nodejs-packaging BuildRequires: web-assets-devel @@ -47,12 +53,13 @@ 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 @@ -73,14 +80,17 @@ 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 +%doc LICENSE README.md %{_jsdir}/underscore %changelog +* Fri Apr 18 2014 Jamie Nguyen - 1.6.0-1 +- update to upstream release 1.6.0 + * Sun Jan 19 2014 T.C. Hollingsworth - 1.5.1-2 - ship a browser version - add missing BuildRequires on uglify-js diff --git a/sources b/sources index b2cee61..65538f0 100644 --- a/sources +++ b/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 From 155b0c9ba1141c8bde66a35bad95d29458e32fc7 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Sat, 26 Apr 2014 11:28:46 +0100 Subject: [PATCH 2/5] Add jsdir logic for EL6 --- nodejs-underscore.spec | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/nodejs-underscore.spec b/nodejs-underscore.spec index 7685998..29ac49f 100644 --- a/nodejs-underscore.spec +++ b/nodejs-underscore.spec @@ -2,9 +2,15 @@ %global enable_tests 0 +%if 0%{?fedora} +%global installdir %{_jsdir}/underscore +%else +%global installdir %{_datadir}/javascript/underscore +%endif + Name: nodejs-underscore Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JavaScript's functional programming helper library License: MIT Group: System Environment/Libraries @@ -23,8 +29,11 @@ ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch %endif -BuildRequires: nodejs-packaging +%if 0%{?fedora} BuildRequires: web-assets-devel +%endif + +BuildRequires: nodejs-packaging BuildRequires: npm(uglify-js) %if 0%{?enable_tests} @@ -39,7 +48,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 @@ -62,10 +73,10 @@ mkdir -p %{buildroot}%{nodejs_sitelib}/underscore 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 @@ -85,9 +96,13 @@ cp -pr underscore.js underscore-min.js underscore-min.map \ %files -n js-underscore %doc LICENSE README.md -%{_jsdir}/underscore +%{installdir} + %changelog +* Sat Apr 26 2014 Jamie Nguyen - 1.6.0-2 +- add jsdir logic for EL6 + * Fri Apr 18 2014 Jamie Nguyen - 1.6.0-1 - update to upstream release 1.6.0 From 2f76c3232cd7882957f8d8570195e1dc856b64ea Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Sat, 26 Apr 2014 11:34:24 +0100 Subject: [PATCH 3/5] Add SPEC comment --- nodejs-underscore.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nodejs-underscore.spec b/nodejs-underscore.spec index 29ac49f..f576abe 100644 --- a/nodejs-underscore.spec +++ b/nodejs-underscore.spec @@ -1,5 +1,7 @@ %{?nodejs_find_provides_and_requires} +# NOTE TO SELF: Do not update on Fedora <= 20. + %global enable_tests 0 %if 0%{?fedora} From 6972c38638937067a50ca66a1f43e97fe7d04c60 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Thu, 8 May 2014 17:49:54 +0100 Subject: [PATCH 4/5] Depend explicitly on latest version of uglifyjs --- nodejs-underscore.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nodejs-underscore.spec b/nodejs-underscore.spec index f576abe..d13df0a 100644 --- a/nodejs-underscore.spec +++ b/nodejs-underscore.spec @@ -12,7 +12,7 @@ Name: nodejs-underscore Version: 1.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JavaScript's functional programming helper library License: MIT Group: System Environment/Libraries @@ -36,7 +36,7 @@ BuildRequires: web-assets-devel %endif BuildRequires: nodejs-packaging -BuildRequires: npm(uglify-js) +BuildRequires: uglify-js %if 0%{?enable_tests} BuildRequires: npm(phantomjs) @@ -102,6 +102,9 @@ cp -pr underscore.js underscore-min.js underscore-min.map \ %changelog +* Thu May 08 2014 Jamie Nguyen - 1.6.0-3 +- depend explicitly on latest version of uglifyjs + * Sat Apr 26 2014 Jamie Nguyen - 1.6.0-2 - add jsdir logic for EL6 From 758a06943b14cbe937761759e7259973e3101801 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 09:47:05 -0500 Subject: [PATCH 5/5] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- nodejs-underscore.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nodejs-underscore.spec b/nodejs-underscore.spec index d13df0a..5efa987 100644 --- a/nodejs-underscore.spec +++ b/nodejs-underscore.spec @@ -12,7 +12,7 @@ Name: nodejs-underscore Version: 1.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: JavaScript's functional programming helper library License: MIT Group: System Environment/Libraries @@ -102,6 +102,9 @@ cp -pr underscore.js underscore-min.js underscore-min.map \ %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu May 08 2014 Jamie Nguyen - 1.6.0-3 - depend explicitly on latest version of uglifyjs