From edf2779f2357b35fe1cd59662fce1f44ec45d98c Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Wed, 23 May 2018 09:53:19 +0000 Subject: [PATCH 01/12] Updated modulemd, completely rewriten --- nginx.yaml | 56 ++++++++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/nginx.yaml b/nginx.yaml index a913cf3..f08a705 100644 --- a/nginx.yaml +++ b/nginx.yaml @@ -6,48 +6,38 @@ data: license: module: [ MIT ] dependencies: - buildrequires: - base-runtime: master + - buildrequires: + platform: [f28] requires: - base-runtime: master + platform: [f28] references: - community: https://docs.pagure.org/modularity/ - documentation: https://github.com/container-images/nginx - tracker: https://github.com/container-images/nginx + documentation: http://nginx.org/en/docs/ + tracker: https://trac.nginx.org/nginx/ profiles: default: rpms: - nginx + - nginx-mod-http-geoip + - nginx-mod-http-image-filter + - nginx-mod-http-perl + - nginx-mod-http-xslt-filter + - nginx-mod-mail + - nginx-mod-stream + - nginx-filesystem + - nginx-all-modules api: rpms: - nginx + - nginx-mod-http-geoip + - nginx-mod-http-image-filter + - nginx-mod-http-perl + - nginx-mod-http-xslt-filter + - nginx-mod-mail + - nginx-mod-stream + - nginx-filesystem + - nginx-all-modules components: rpms: nginx: - rationale: Provides API for this module. - ref: f26 - - gperftools: - rationale: dependency - ref: f26 - libmnl: - rationale: dependency - ref: f26 - libnetfilter_conntrack: - rationale: dependency - ref: f26 - libnfnetlink: - rationale: dependency - ref: f26 - libunwind: - rationale: dependency - ref: f26 - libxkbcommon: - rationale: dependency - ref: f26 - mailcap: - rationale: dependency - ref: f26 - xkeyboard-config: - rationale: dependency - ref: f26 + rationale: Module API. + ref: stream-1.12 From 4da90d45b6a0ba05a85fbdaeaba1779f869a6b5e Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Wed, 23 May 2018 11:08:48 +0000 Subject: [PATCH 02/12] Changed modulemd version --- nginx.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.yaml b/nginx.yaml index f08a705..d148249 100644 --- a/nginx.yaml +++ b/nginx.yaml @@ -1,5 +1,5 @@ document: modulemd -version: 1 +version: 2 data: summary: nginx webserver description: an initial version of the nginx webserver module From e40f03de145390854dc9ba2daa842ad2ca75edb8 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Wed, 23 May 2018 11:12:57 +0000 Subject: [PATCH 03/12] Fix indent in yaml --- nginx.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.yaml b/nginx.yaml index d148249..afe8171 100644 --- a/nginx.yaml +++ b/nginx.yaml @@ -8,7 +8,7 @@ data: dependencies: - buildrequires: platform: [f28] - requires: + requires: platform: [f28] references: documentation: http://nginx.org/en/docs/ From eadc7ab4e5592626f2f419329b888463399f7053 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Fri, 10 Aug 2018 07:35:07 +0000 Subject: [PATCH 04/12] Updated module - merged with master (python dependency, disable GeoIP..) From 54c81875cc7d2a29b51cfb07d35402f110efa50a Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Fri, 10 Aug 2018 07:44:18 +0000 Subject: [PATCH 05/12] new branch for stream-1.14 --- nginx.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.yaml b/nginx.yaml index afe8171..c3f7505 100644 --- a/nginx.yaml +++ b/nginx.yaml @@ -40,4 +40,4 @@ data: rpms: nginx: rationale: Module API. - ref: stream-1.12 + ref: stream-1.14 From c26170f23c44f63e97e70ff5890a497421247cb3 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Wed, 29 May 2019 13:40:29 +0200 Subject: [PATCH 06/12] updated nginx.yaml file. Changed profile name from default to common. Build on f31 only. --- nginx.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nginx.yaml b/nginx.yaml index c3f7505..719ab57 100644 --- a/nginx.yaml +++ b/nginx.yaml @@ -2,22 +2,21 @@ document: modulemd version: 2 data: summary: nginx webserver - description: an initial version of the nginx webserver module + description: nginx 1.14 webserver module license: module: [ MIT ] dependencies: - buildrequires: - platform: [f28] + platform: [f31] requires: - platform: [f28] + platform: [f31] references: documentation: http://nginx.org/en/docs/ tracker: https://trac.nginx.org/nginx/ profiles: - default: + common: rpms: - nginx - - nginx-mod-http-geoip - nginx-mod-http-image-filter - nginx-mod-http-perl - nginx-mod-http-xslt-filter @@ -28,7 +27,6 @@ data: api: rpms: - nginx - - nginx-mod-http-geoip - nginx-mod-http-image-filter - nginx-mod-http-perl - nginx-mod-http-xslt-filter From cc67efb9ca9446547aa7b82628af6acfe77f8c43 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Wed, 29 May 2019 16:00:33 +0200 Subject: [PATCH 07/12] Update module description and component stream. --- nginx.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.yaml b/nginx.yaml index 719ab57..16c0838 100644 --- a/nginx.yaml +++ b/nginx.yaml @@ -2,7 +2,7 @@ document: modulemd version: 2 data: summary: nginx webserver - description: nginx 1.14 webserver module + description: nginx 1.16 webserver module license: module: [ MIT ] dependencies: @@ -38,4 +38,4 @@ data: rpms: nginx: rationale: Module API. - ref: stream-1.14 + ref: stream-1.16 From c5dec496d90334b61525d22e7fbdabfeb2833558 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Mon, 3 Jun 2019 15:09:12 +0200 Subject: [PATCH 08/12] Set module name and stream in yaml file --- nginx.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nginx.yaml b/nginx.yaml index 16c0838..808c8c1 100644 --- a/nginx.yaml +++ b/nginx.yaml @@ -1,6 +1,8 @@ document: modulemd version: 2 data: + name: nginx + stream: 1.16 summary: nginx webserver description: nginx 1.16 webserver module license: From 5ebbd51d62b837d64e09ae882e4216b5af8d41ed Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Thu, 11 Jul 2019 11:58:54 -0400 Subject: [PATCH 09/12] Enable build on all Fedora releases --- nginx.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.yaml b/nginx.yaml index 808c8c1..36674db 100644 --- a/nginx.yaml +++ b/nginx.yaml @@ -9,9 +9,9 @@ data: module: [ MIT ] dependencies: - buildrequires: - platform: [f31] + platform: [] requires: - platform: [f31] + platform: [] references: documentation: http://nginx.org/en/docs/ tracker: https://trac.nginx.org/nginx/ From 3c5ed7cabdbf34c2f27d3441d63dbf51bb3a2204 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Tue, 22 Oct 2019 19:22:18 -0400 Subject: [PATCH 10/12] 1.16.2 Signed-off-by: Felix Kaechele From 678379088629ec5c7e5cf13ff48af16a4025e8a5 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Sun, 7 Jun 2020 12:43:48 -0400 Subject: [PATCH 11/12] Update spec file and patches From 9ece79c2c750f9554c44f4e2a68804a00f6a5316 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Wed, 19 Jan 2022 12:10:14 -0500 Subject: [PATCH 12/12] Do not build for EL8 EL8 has it's own 1.16 stream Signed-off-by: Felix Kaechele --- nginx.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.yaml b/nginx.yaml index 36674db..699dd4f 100644 --- a/nginx.yaml +++ b/nginx.yaml @@ -9,9 +9,9 @@ data: module: [ MIT ] dependencies: - buildrequires: - platform: [] + platform: [-el8] # EL8+ contains it's own 1.16 stream requires: - platform: [] + platform: [-el8] references: documentation: http://nginx.org/en/docs/ tracker: https://trac.nginx.org/nginx/