From e5899f64e52d4f4f0d182b5765533b49dd523154 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Wed, 20 Sep 2017 15:43:16 +0200 Subject: [PATCH 1/7] Fix yaml --- nodejs.yaml | 72 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 20 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index 0e26ef5..6482806 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -1,14 +1,8 @@ +document: modulemd +version: 1 data: - api: - rpms: - - nodejs - components: - rpms: - compat-openssl10: {rationale: Build dependency.} - gcc: {rationale: Build dependency.} - icu: {rationale: Build dependency.} - libuv: {rationale: Build and runtime dependency.} - description: 'Node.js is a platform built on Chrome''s JavaScript runtime + summary: Javascript runtime + description: Node.js is a platform built on Chrome''s JavaScript runtime for easily building fast, scalable network applications. @@ -16,13 +10,51 @@ data: makes it lightweight and efficient, perfect for data-intensive - real-time applications that run across distributed devices.' - filter: {} - license: - module: [MIT and ASL 2.0 and ISC and BSD] - name: '' - stream: '' - summary: JavaScript runtime - version: 0 -document: modulemd -version: 1 + real-time applications that run across distributed devices. + license: + module: MIT + content: [MIT and ASL 2.0 and ISC and BSD] + dependencies: + buildrequires: + # http-parser, libuv, c-ares and V8 are bundled + # icu and zlib should be provided by platform + platform: master + compat-openssl10: master + requires: + platform: master + compat-openssl10: master + references: + community: http://nodejs.org + documentation: http://nodejs.org/en/docs + github: http://github.com/nodejs/node + npm: http://npmjs.com + profiles: + default: + rpms: + - nodejs + - npm + development: + rpms: + - nodejs + - nodejs-devel + - npm + minimal: + rpms: + - nodejs + api: + rpms: + - nodejs + - nodejs-devel + - npm + components: + rpms: + nodejs: + rationale: Javascript runtime. + buildorder: 10 + ref: d54471 + npm: + rationale: npm package manager. + buildorder: 20 + nodejs-packaging: + rationale: Runtime dependency of nodejs-devel. + buildorder: 10 From afb156364a61f3846cee6400f2df8859a6cd8e67 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Wed, 20 Sep 2017 15:47:05 +0200 Subject: [PATCH 2/7] Fix description --- nodejs.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index 6482806..c81cc8f 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -3,13 +3,9 @@ version: 1 data: summary: Javascript runtime description: Node.js is a platform built on Chrome''s JavaScript runtime - for easily building fast, scalable network applications. - Node.js uses an event-driven, non-blocking I/O model that - makes it lightweight and efficient, perfect for data-intensive - real-time applications that run across distributed devices. license: module: MIT From 6816f3148fe32e313fe48a66cd0aad6c31a2370d Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Wed, 20 Sep 2017 15:49:33 +0200 Subject: [PATCH 3/7] Fix description --- nodejs.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index c81cc8f..e6ea357 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -2,11 +2,12 @@ document: modulemd version: 1 data: summary: Javascript runtime - description: Node.js is a platform built on Chrome''s JavaScript runtime - for easily building fast, scalable network applications. - Node.js uses an event-driven, non-blocking I/O model that - makes it lightweight and efficient, perfect for data-intensive - real-time applications that run across distributed devices. + description: >- + Node.js is a platform built on Chrome''s JavaScript runtime + for easily building fast, scalable network applications. + Node.js uses an event-driven, non-blocking I/O model that + makes it lightweight and efficient, perfect for data-intensive + real-time applications that run across distributed devices. license: module: MIT content: [MIT and ASL 2.0 and ISC and BSD] From 05380af1a85ffcee5a140d0b0a9e487f825bb19d Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Wed, 20 Sep 2017 17:03:42 +0200 Subject: [PATCH 4/7] Remove nodejs licenses and openssl dependency --- nodejs.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index e6ea357..f6e72b4 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -10,16 +10,13 @@ data: real-time applications that run across distributed devices. license: module: MIT - content: [MIT and ASL 2.0 and ISC and BSD] dependencies: buildrequires: # http-parser, libuv, c-ares and V8 are bundled - # icu and zlib should be provided by platform + # openssl, icu and zlib should be provided by platform platform: master - compat-openssl10: master requires: platform: master - compat-openssl10: master references: community: http://nodejs.org documentation: http://nodejs.org/en/docs From 02400daa62b27b3abae4d2901a069d27f865306f Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Thu, 21 Sep 2017 11:01:56 +0200 Subject: [PATCH 5/7] Add python2 dependency --- nodejs.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nodejs.yaml b/nodejs.yaml index f6e72b4..4f5ef6d 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -15,8 +15,10 @@ data: # http-parser, libuv, c-ares and V8 are bundled # openssl, icu and zlib should be provided by platform platform: master + python2: master requires: platform: master + python2: master references: community: http://nodejs.org documentation: http://nodejs.org/en/docs From ae3c992f7cc00131b2cd8297ef1b03de92fc773b Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Fri, 22 Sep 2017 15:43:39 +0200 Subject: [PATCH 6/7] Rebuild with new python2 build From 60be7b9df440f1ba25f0a21272988094e59af414 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Mon, 25 Sep 2017 09:33:59 +0200 Subject: [PATCH 7/7] Remove npm from components --- nodejs.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nodejs.yaml b/nodejs.yaml index 4f5ef6d..f851ef1 100644 --- a/nodejs.yaml +++ b/nodejs.yaml @@ -45,12 +45,9 @@ data: components: rpms: nodejs: - rationale: Javascript runtime. + rationale: Javascript runtime and npm package manager. buildorder: 10 ref: d54471 - npm: - rationale: npm package manager. - buildorder: 20 nodejs-packaging: rationale: Runtime dependency of nodejs-devel. buildorder: 10