diff --git a/.gitignore b/.gitignore index 8450681..3402c7c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/request-2.25.0.tgz +SOURCES/request-2.42.0.tgz diff --git a/.nodejs010-nodejs-request.metadata b/.nodejs010-nodejs-request.metadata index 0f11dd2..a614d40 100644 --- a/.nodejs010-nodejs-request.metadata +++ b/.nodejs010-nodejs-request.metadata @@ -1 +1 @@ -dac1673181887fe0b2ce6bd7e12f46d554a02ce9 SOURCES/request-2.25.0.tgz +572bd0148938564040ac7ab148b96423a063304a SOURCES/request-2.42.0.tgz diff --git a/SPECS/nodejs-request.spec b/SPECS/nodejs-request.spec index 2735bd1..64bde7b 100644 --- a/SPECS/nodejs-request.spec +++ b/SPECS/nodejs-request.spec @@ -4,33 +4,16 @@ %global enable_tests 0 -Name: %{?scl_prefix}nodejs-request -Version: 2.25.0 -Release: 2%{?dist} -Summary: Simplified HTTP request client -License: ASL 2.0 -Group: Development/Libraries -URL: https://github.com/mikeal/request -Source0: http://registry.npmjs.org/request/-/request-%{version}.tgz -BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -ExclusiveArch: %{nodejs_arches} noarch - -BuildRequires: %{?scl_prefix}nodejs-devel - -%if 0%{?enable_tests} -BuildRequires: npm(aws-sign) -BuildRequires: npm(cookie-jar) -BuildRequires: npm(forever-agent) -BuildRequires: npm(form-data) -BuildRequires: npm(hawk) -BuildRequires: npm(json-stringify-safe) -BuildRequires: npm(mime) -BuildRequires: npm(node-uuid) -BuildRequires: npm(oauth-sign) -BuildRequires: npm(qs) -BuildRequires: npm(tunnel-agent) -%endif +Name: %{?scl_prefix}nodejs-request +Version: 2.42.0 +Release: 6%{?dist} +Summary: Simplified HTTP request client +License: ASL 2.0 +URL: https://github.com/request/request +Source0: http://registry.npmjs.org/request/-/request-%{version}.tgz +BuildArch: noarch +ExclusiveArch: %{ix86} x86_64 %{arm} noarch +BuildRequires: %{?scl_prefix}nodejs-devel %description Request is designed to be the simplest way possible to make HTTP calls. It @@ -42,6 +25,12 @@ PUT or POST request. It also supports a few simple server and proxy functions. %prep %setup -q -n package +%nodejs_fixdep bl 1.0.0 +%nodejs_fixdep tunnel-agent '>=0.3.0' +%nodejs_fixdep caseless '<1.0' +%nodejs_fixdep mime-types '>2.0' +%nodejs_fixdep qs '>=0.6.5' + #remove bundled modules rm -rf node_modules @@ -49,31 +38,42 @@ rm -rf node_modules #nothing to do %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{nodejs_sitelib}/request -cp -pr *.js package.json %{buildroot}%{nodejs_sitelib}/request +cp -pr lib/ *.js package.json %{buildroot}%{nodejs_sitelib}/request %nodejs_symlink_deps %if 0%{?enable_tests} %check -rm -f tests/test-tunnel.js -ln -sf %{nodejs_sitelib} . -%__nodejs tests/run.js +node tests/run.js %endif - -%clean -rm -rf %{buildroot} - %files -%defattr(-,root,root,-) %{nodejs_sitelib}/request -%doc README.md LICENSE +%doc README.md +%license LICENSE %changelog +* Fri Sep 11 2015 Zuzana Svetlikova - 2.42.0-6 +- Add lib/ to %%install + +* Thu Aug 20 2015 Zuzana Svetlikova - 2.42.0-5 +- Rebuilt + +* Thu Aug 20 2015 Zuzana Svetlikova - 2.42.0-4 +- Modified macros + +* Thu Aug 13 2015 Zuzana Svetlikova - 2.42.0-3 +- Add %%nodejs_fixdep macros + +* Mon Aug 10 2015 Zuzana Svetlikova - 2.42.0-2 +- Fix ExclusiveArch + +* Wed Jul 15 2015 Zuzana Svetlikova - 2.42.0-1 +- New upstream release +- minor changes + * Thu Oct 17 2013 Tomas Hrcka - 2.25.0-2 - replace provides and requires with macro