From 79f8fbd42da94321864f392d29939b33c1baa702 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: May 10 2019 18:42:50 +0000 Subject: Update to 2.0.6 upstream release --- diff --git a/.gitignore b/.gitignore index 0c53948..1b1bf45 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /har-validator-a71163c.tar.gz +/har-validator-2.0.6.tar.gz diff --git a/nodejs-har-validator-should8.patch b/nodejs-har-validator-should8.patch deleted file mode 100644 index 1c10a95..0000000 --- a/nodejs-har-validator-should8.patch +++ /dev/null @@ -1,85 +0,0 @@ -commit c66cfc8820efdfdac580ede98414e970dda4e84d -Author: Tom Hughes -Date: Sat Dec 19 17:30:37 2015 +0000 - - Update to should 8.x which now includes should-promised - -diff --git a/package.json b/package.json -index 1a69e52..351f9c0 100644 ---- a/package.json -+++ b/package.json -@@ -43,8 +43,7 @@ - "istanbul": "^0.4.0", - "mocha": "^2.3.4", - "require-directory": "^2.1.1", -- "should": "^7.1.1", -- "should-promised": "^0.3.1", -+ "should": "^8.0.2", - "standard": "^5.4.1" - }, - "dependencies": { -diff --git a/test/index.js b/test/index.js -index 05c481c..2416f68 100644 ---- a/test/index.js -+++ b/test/index.js -@@ -6,8 +6,6 @@ var fixtures = require('./fixtures') - var validate = require('..') - var ValidationError = require('../lib/error') - --require('should-promised') -- - describe('Promises', function () { - it('should return a Promise', function () { - validate().should.be.a.Promise() -diff --git a/test/log.js b/test/log.js -index 7d1c0cb..1bcd3a7 100644 ---- a/test/log.js -+++ b/test/log.js -@@ -6,8 +6,6 @@ var fixtures = require('./fixtures') - var validate = require('..') - var ValidationError = require('../lib/error') - --require('should-promised') -- - describe('Full HAR', function () { - it('should fail with empty object', function () { - validate({}).should.be.rejectedWith(ValidationError, { -diff --git a/test/misc.js b/test/misc.js -index fbf3a7c..6b342b9 100644 ---- a/test/misc.js -+++ b/test/misc.js -@@ -4,8 +4,6 @@ - - var validate = require('..') - --require('should-promised') -- - describe('Cache Entry', function () { - it('should allow null beforeRequest', function () { - var cache = { -diff --git a/test/request.js b/test/request.js -index 4422f5c..5c446a5 100644 ---- a/test/request.js -+++ b/test/request.js -@@ -6,8 +6,6 @@ var fixtures = require('./fixtures') - var validate = require('..') - var ValidationError = require('../lib/error') - --require('should-promised') -- - describe('Request Only', function () { - it('should fail with empty object', function () { - validate.request({}).should.be.rejectedWith(ValidationError, { -diff --git a/test/response.js b/test/response.js -index e4bfd0f..2761b6d 100644 ---- a/test/response.js -+++ b/test/response.js -@@ -6,8 +6,6 @@ var fixtures = require('./fixtures') - var validate = require('..') - var ValidationError = require('../lib/error') - --require('should-promised') -- - describe('Response Only', function () { - it('should fail with empty object', function () { - validate.response({}).should.be.rejectedWith(ValidationError, { diff --git a/nodejs-har-validator.spec b/nodejs-har-validator.spec index 46cda60..042fbe7 100644 --- a/nodejs-har-validator.spec +++ b/nodejs-har-validator.spec @@ -1,80 +1,60 @@ -# needed for building on el6 -%{?nodejs_find_provides_and_requires} - -%global enable_tests 1 -%global srcname har-validator - -%global commit0 a71163c62b8786a41d503248fb60893598f3c26f -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global owner ahmadnassri - -Name: nodejs-%{srcname} -Version: 2.0.3 -Release: 8%{?dist} +Name: nodejs-har-validator +Version: 2.0.6 +Release: 1%{?dist} Summary: Extremely fast HTTP Archive (HAR) validator using JSON Schema -License: ISC -URL: https://github.com/%{owner}/%{srcname} -Source0: https://github.com/%{owner}/%{srcname}/archive/%{commit0}.tar.gz#/%{srcname}-%{shortcommit0}.tar.gz -# https://github.com/ahmadnassri/har-validator/pull/15 -Patch0: nodejs-har-validator-should8.patch +License: ISC +URL: https://github.com/ahmadnassri/node-har-validator +Source0: https://github.com/ahmadnassri/node-har-validator/archive/v%{version}/har-validator-%{version}.tar.gz BuildArch: noarch - -%if 0%{?rhel} == 6 -ExclusiveArch: %{ix86} x86_64 %{arm} noarch -%else ExclusiveArch: %{nodejs_arches} noarch -%endif BuildRequires: nodejs-packaging -%if 0%{?enable_tests} BuildRequires: npm(mocha) BuildRequires: npm(require-directory) BuildRequires: npm(pinkie-promise) BuildRequires: npm(is-my-json-valid) BuildRequires: npm(should) >= 8.0.0 -%endif %description %{summary}. -%prep -%autosetup -p 1 -n %{srcname}-%{commit0} -rm -rf node_modules +%prep +%autosetup -p 1 -n node-har-validator-%{version} %nodejs_fixdep chalk %nodejs_fixdep commander '2.x' +rm -rf node_modules -%build -#nothing to do -%install -mkdir -p %{buildroot}%{nodejs_sitelib}/%{srcname} +%build -cp -pr package.json lib/ bin/ \ - %{buildroot}%{nodejs_sitelib}/%{srcname} +%install +mkdir -p %{buildroot}%{nodejs_sitelib}/har-validator +cp -pr package.json lib bin %{buildroot}%{nodejs_sitelib}/har-validator mkdir -p %{buildroot}%{_bindir} -ln -s %{nodejs_sitelib}/%{srcname}/bin/har-validator \ - %{buildroot}%{_bindir}/har-validator - +ln -s %{nodejs_sitelib}/har-validator/bin/har-validator %{buildroot}%{_bindir}/har-validator %nodejs_symlink_deps -%if 0%{?enable_tests} + %check %nodejs_symlink_deps --check mocha -%endif + %files -%{!?_licensedir:%global license %doc} %doc README.md %license LICENSE -%{nodejs_sitelib}/%{srcname} +%{nodejs_sitelib}/har-validator %{_bindir}/har-validator + %changelog +* Fri May 10 2019 Tom Hughes - 2.0.6-1 +- Update to 2.0.6 upstream release + * Fri Feb 01 2019 Fedora Release Engineering - 2.0.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index a891f75..e804340 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -577b299bd9a9adbb6297a9665df11aca har-validator-a71163c.tar.gz +SHA512 (har-validator-2.0.6.tar.gz) = e2bf75dcc69f12232f1137607679eb9382c8fad663636c15c216992436a08003d4c6f1237c81c744e69f1cfb797bf5b3fb19cda3a179e722c6d02551f0875d4d