From 69b5100406af0b82262d626e9aef450eddeee8d9 Mon Sep 17 00:00:00 2001
From: wangchong1995924 <15229716099@163.com>
Date: Fri, 21 Aug 2020 11:11:08 +0800
Subject: [PATCH 1/3] package init

---
 nodejs-spdx-expression-parse.spec | 4 ++++
 nodejs-spdx-expression-parse.yaml | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100644 nodejs-spdx-expression-parse.spec
 create mode 100644 nodejs-spdx-expression-parse.yaml

diff --git a/nodejs-spdx-expression-parse.spec b/nodejs-spdx-expression-parse.spec
new file mode 100644
index 0000000..225b435
--- /dev/null
+++ b/nodejs-spdx-expression-parse.spec
@@ -0,0 +1,4 @@
+
+%changelog
+* Fri Aug 21 2020 wangchong <wangchong56@huawei.com> - -1
+- package init
diff --git a/nodejs-spdx-expression-parse.yaml b/nodejs-spdx-expression-parse.yaml
new file mode 100644
index 0000000..4e5a19c
--- /dev/null
+++ b/nodejs-spdx-expression-parse.yaml
@@ -0,0 +1,4 @@
+version-control: github
+src_repo: sctp/lksctp-tools
+tag_prefix: ^v
+seperator: .

From 77e3850c8159dc1c565412e3b31dd3b577a153a6 Mon Sep 17 00:00:00 2001
From: wangchong1995924 <15229716099@163.com>
Date: Fri, 21 Aug 2020 15:43:04 +0800
Subject: [PATCH 2/3] package init

---
 generate-parser.js                |  87 ++++++++++++++++++++++++++++++
 nodejs-spdx-expression-parse.spec |  49 ++++++++++++++++-
 nodejs-spdx-expression-parse.yaml |   2 +-
 spdx-expression-parse-1.0.2.tgz   | Bin 0 -> 9344 bytes
 4 files changed, 136 insertions(+), 2 deletions(-)
 create mode 100644 generate-parser.js
 create mode 100644 spdx-expression-parse-1.0.2.tgz

diff --git a/generate-parser.js b/generate-parser.js
new file mode 100644
index 0000000..bcb2e4e
--- /dev/null
+++ b/generate-parser.js
@@ -0,0 +1,87 @@
+var Generator = require('jison').Generator
+var options = {
+  type: 'slr',
+  moduleType: 'commonjs',
+  moduleName: 'spdxparse' }
+
+var words = [ 'AND', 'OR', 'WITH' ]
+
+var quote = function(argument) {
+  return '\'' + argument + '\'' }
+
+var regexEscape = function(s) {
+  return s.replace(/[\^\\$*+?.()|{}\[\]\/]/g, '\\$&') }
+
+var handleLicensesAndExceptions = function() {
+  var ids = require('spdx-license-ids')
+  var exceptions = require('spdx-exceptions')
+
+  // Sort tokens longest-first (both license ids and exception strings)
+  var tokens = ids.concat(exceptions)
+  tokens.sort(function(a, b) { return ( b.length - a.length ) })
+  return tokens.map(function(t) {
+    var type = ( (ids.indexOf(t) >= 0) ? 'LICENSE' : 'EXCEPTION' )
+    return [ regexEscape(t), ( 'return ' + quote(type) ) ] }) }
+
+var grammar = {
+  lex: {
+    macros: { },
+    rules: [
+      [ '$', 'return ' + quote('EOS') ],
+      [ '\\s+', '/* skip whitespace */' ],
+      [ '\\+', 'return ' + quote('PLUS') ],
+      [ '\\(', 'return ' + quote('OPEN') ],
+      [ '\\)', 'return ' + quote('CLOSE') ],
+      [ ':', 'return ' + quote('COLON') ],
+      [ 'DocumentRef-([0-9A-Za-z-+.]+)',
+        'return ' + quote('DOCUMENTREF') ],
+      [ 'LicenseRef-([0-9A-Za-z-+.]+)',
+        'return ' + quote('LICENSEREF') ] ]
+      .concat(words.map(function(word) {
+        return [ word, 'return ' + quote(word) ] }))
+      .concat(handleLicensesAndExceptions()) },
+  operators: [
+    [ 'left', 'OR' ],
+    [ 'left', 'AND' ],
+    [ 'right', 'PLUS', 'WITH' ] ],
+  tokens: [
+    'CLOSE',
+    'COLON',
+    'EXCEPTION',
+    'LICENSE',
+    'LICENSEREF',
+    'OPEN',
+    'PLUS' ]
+    .concat(words)
+    .join(' '),
+  start: 'start',
+  bnf: {
+    start: [
+      [ 'expression EOS', 'return $$ = $1' ] ],
+    simpleExpression: [
+      [ 'LICENSE',
+        '$$ = { license: yytext }' ],
+      [ 'LICENSE PLUS',
+        '$$ = { license: $1, plus: true }' ],
+      [ 'LICENSEREF',
+        '$$ = { license: yytext }' ],
+      [ 'DOCUMENTREF COLON LICENSEREF',
+        '$$ = { license: yytext }' ] ],
+    expression: [
+      [ 'simpleExpression',
+        '$$ = $1' ],
+      [ 'simpleExpression WITH EXCEPTION',
+        [ '$$ = { exception: $3 }',
+          '$$.license = $1.license',
+          'if ($1.hasOwnProperty(\'plus\')) {',
+          '  $$.plus = $1.plus',
+          '}' ]
+          .join('\n') ],
+      [ 'expression AND expression',
+        '$$ = { conjunction: \'and\', left: $1, right: $3 }' ],
+      [ 'expression OR expression',
+        '$$ = { conjunction: \'or\', left: $1, right: $3 }' ],
+      [ 'OPEN expression CLOSE',
+        '$$ = $2' ] ] } }
+
+console.log(new Generator(grammar, options).generate())
diff --git a/nodejs-spdx-expression-parse.spec b/nodejs-spdx-expression-parse.spec
index 225b435..2778bbf 100644
--- a/nodejs-spdx-expression-parse.spec
+++ b/nodejs-spdx-expression-parse.spec
@@ -1,4 +1,51 @@
+%{?nodejs_find_provides_and_requires}
+%global packagename spdx-expression-parse
+%global enable_tests 1
+Name:		nodejs-spdx-expression-parse
+Version:	1.0.2
+Release:	1
+Summary:	Parse SPDX license expressions
+License:	MIT and CC-BY
+URL:		https://github.com/kemitchell/spdx-expression-parse.js.git
+Source0:	https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-%{version}.tgz
+Source1:	https://raw.githubusercontent.com/kemitchell/spdx-expression-parse.js/v%{version}/generate-parser.js
+ExclusiveArch:	%{nodejs_arches} noarch
+BuildArch:	noarch
+BuildRequires:       	nodejs-packaging 	uglify-js 	npm(jison) npm(spdx-license-ids)
+BuildRequires:       npm(spdx-exceptions)
+%if 0%{?enable_tests}
+%endif
+Requires:            	nodejs
+%description
+Parse SPDX license expressions
+
+%prep
+%setup -q -n package
+cp -p %{SOURCE1} .
+rm parser.generated.js
+
+%build
+%nodejs_symlink_deps --check
+%__nodejs generate-parser.js | %{_bindir}/uglifyjs > parser.generated.js
+
+%install
+mkdir -p %{buildroot}%{nodejs_sitelib}/%{packagename}
+cp -pr package.json *.js \
+	%{buildroot}%{nodejs_sitelib}/%{packagename}
+%nodejs_symlink_deps
+
+%check
+%{__nodejs} -e 'require("./")'
+%if 0%{?enable_tests}
+echo "There are no tests..."
+%endif
+
+%files
+%{!?_licensedir:%global license %doc}
+%doc *.md
+%license LICENSE
+%{nodejs_sitelib}/%{packagename}
 
 %changelog
-* Fri Aug 21 2020 wangchong <wangchong56@huawei.com> - -1
+* Fri Aug 21 2020 wangchong <wangchong56@huawei.com> - 1.0.2-1
 - package init
diff --git a/nodejs-spdx-expression-parse.yaml b/nodejs-spdx-expression-parse.yaml
index 4e5a19c..7237a42 100644
--- a/nodejs-spdx-expression-parse.yaml
+++ b/nodejs-spdx-expression-parse.yaml
@@ -1,4 +1,4 @@
 version-control: github
-src_repo: sctp/lksctp-tools
+src_repo: kemitchell/spdx-expression-parse.js
 tag_prefix: ^v
 seperator: .
diff --git a/spdx-expression-parse-1.0.2.tgz b/spdx-expression-parse-1.0.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..32ed7918c048abc15a600919aab163b82786dd6a
GIT binary patch
literal 9344
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
P{;$ZEb`21s5D@+Y_FI27

literal 0
HcmV?d00001


From 11e47409182bc1b67f266da5b23ef5e3065284ed Mon Sep 17 00:00:00 2001
From: wangchong1995924 <15229716099@163.com>
Date: Fri, 21 Aug 2020 16:01:09 +0800
Subject: [PATCH 3/3] fix the warning

---
 generate-parser.js                | 87 -------------------------------
 nodejs-spdx-expression-parse.spec | 10 ++--
 nodejs-spdx-expression-parse.yaml |  2 +-
 3 files changed, 4 insertions(+), 95 deletions(-)
 delete mode 100644 generate-parser.js

diff --git a/generate-parser.js b/generate-parser.js
deleted file mode 100644
index bcb2e4e..0000000
--- a/generate-parser.js
+++ /dev/null
@@ -1,87 +0,0 @@
-var Generator = require('jison').Generator
-var options = {
-  type: 'slr',
-  moduleType: 'commonjs',
-  moduleName: 'spdxparse' }
-
-var words = [ 'AND', 'OR', 'WITH' ]
-
-var quote = function(argument) {
-  return '\'' + argument + '\'' }
-
-var regexEscape = function(s) {
-  return s.replace(/[\^\\$*+?.()|{}\[\]\/]/g, '\\$&') }
-
-var handleLicensesAndExceptions = function() {
-  var ids = require('spdx-license-ids')
-  var exceptions = require('spdx-exceptions')
-
-  // Sort tokens longest-first (both license ids and exception strings)
-  var tokens = ids.concat(exceptions)
-  tokens.sort(function(a, b) { return ( b.length - a.length ) })
-  return tokens.map(function(t) {
-    var type = ( (ids.indexOf(t) >= 0) ? 'LICENSE' : 'EXCEPTION' )
-    return [ regexEscape(t), ( 'return ' + quote(type) ) ] }) }
-
-var grammar = {
-  lex: {
-    macros: { },
-    rules: [
-      [ '$', 'return ' + quote('EOS') ],
-      [ '\\s+', '/* skip whitespace */' ],
-      [ '\\+', 'return ' + quote('PLUS') ],
-      [ '\\(', 'return ' + quote('OPEN') ],
-      [ '\\)', 'return ' + quote('CLOSE') ],
-      [ ':', 'return ' + quote('COLON') ],
-      [ 'DocumentRef-([0-9A-Za-z-+.]+)',
-        'return ' + quote('DOCUMENTREF') ],
-      [ 'LicenseRef-([0-9A-Za-z-+.]+)',
-        'return ' + quote('LICENSEREF') ] ]
-      .concat(words.map(function(word) {
-        return [ word, 'return ' + quote(word) ] }))
-      .concat(handleLicensesAndExceptions()) },
-  operators: [
-    [ 'left', 'OR' ],
-    [ 'left', 'AND' ],
-    [ 'right', 'PLUS', 'WITH' ] ],
-  tokens: [
-    'CLOSE',
-    'COLON',
-    'EXCEPTION',
-    'LICENSE',
-    'LICENSEREF',
-    'OPEN',
-    'PLUS' ]
-    .concat(words)
-    .join(' '),
-  start: 'start',
-  bnf: {
-    start: [
-      [ 'expression EOS', 'return $$ = $1' ] ],
-    simpleExpression: [
-      [ 'LICENSE',
-        '$$ = { license: yytext }' ],
-      [ 'LICENSE PLUS',
-        '$$ = { license: $1, plus: true }' ],
-      [ 'LICENSEREF',
-        '$$ = { license: yytext }' ],
-      [ 'DOCUMENTREF COLON LICENSEREF',
-        '$$ = { license: yytext }' ] ],
-    expression: [
-      [ 'simpleExpression',
-        '$$ = $1' ],
-      [ 'simpleExpression WITH EXCEPTION',
-        [ '$$ = { exception: $3 }',
-          '$$.license = $1.license',
-          'if ($1.hasOwnProperty(\'plus\')) {',
-          '  $$.plus = $1.plus',
-          '}' ]
-          .join('\n') ],
-      [ 'expression AND expression',
-        '$$ = { conjunction: \'and\', left: $1, right: $3 }' ],
-      [ 'expression OR expression',
-        '$$ = { conjunction: \'or\', left: $1, right: $3 }' ],
-      [ 'OPEN expression CLOSE',
-        '$$ = $2' ] ] } }
-
-console.log(new Generator(grammar, options).generate())
diff --git a/nodejs-spdx-expression-parse.spec b/nodejs-spdx-expression-parse.spec
index 2778bbf..63e47ec 100644
--- a/nodejs-spdx-expression-parse.spec
+++ b/nodejs-spdx-expression-parse.spec
@@ -8,25 +8,21 @@ Summary:	Parse SPDX license expressions
 License:	MIT and CC-BY
 URL:		https://github.com/kemitchell/spdx-expression-parse.js.git
 Source0:	https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-%{version}.tgz
-Source1:	https://raw.githubusercontent.com/kemitchell/spdx-expression-parse.js/v%{version}/generate-parser.js
 ExclusiveArch:	%{nodejs_arches} noarch
 BuildArch:	noarch
-BuildRequires:       	nodejs-packaging 	uglify-js 	npm(jison) npm(spdx-license-ids)
-BuildRequires:       npm(spdx-exceptions)
+BuildRequires:  nodejs-packaging uglify-js npm(jison) npm(spdx-license-ids)
+BuildRequires:  npm(spdx-exceptions)
 %if 0%{?enable_tests}
 %endif
-Requires:            	nodejs
+Requires:       nodejs
 %description
 Parse SPDX license expressions
 
 %prep
 %setup -q -n package
-cp -p %{SOURCE1} .
-rm parser.generated.js
 
 %build
 %nodejs_symlink_deps --check
-%__nodejs generate-parser.js | %{_bindir}/uglifyjs > parser.generated.js
 
 %install
 mkdir -p %{buildroot}%{nodejs_sitelib}/%{packagename}
diff --git a/nodejs-spdx-expression-parse.yaml b/nodejs-spdx-expression-parse.yaml
index 7237a42..ec5fce1 100644
--- a/nodejs-spdx-expression-parse.yaml
+++ b/nodejs-spdx-expression-parse.yaml
@@ -1,4 +1,4 @@
-version-control: github
+version_control: github
 src_repo: kemitchell/spdx-expression-parse.js
 tag_prefix: ^v
 seperator: .