From edf2779f2357b35fe1cd59662fce1f44ec45d98c Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Wed, 23 May 2018 09:53:19 +0000 Subject: [PATCH 01/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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 a5f7be7fa855331aaed971d754c4d8f287a4d062 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Sat, 1 Jun 2019 21:40:22 -0400 Subject: [PATCH 08/32] new branch for mainline Signed-off-by: Felix Kaechele --- nginx.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.yaml b/nginx.yaml index 16c0838..7d33dd9 100644 --- a/nginx.yaml +++ b/nginx.yaml @@ -2,7 +2,7 @@ document: modulemd version: 2 data: summary: nginx webserver - description: nginx 1.16 webserver module + description: nginx mainline webserver module license: module: [ MIT ] dependencies: @@ -38,4 +38,4 @@ data: rpms: nginx: rationale: Module API. - ref: stream-1.16 + ref: stream-mainline From 874f02e92d23d4326bc1b691160112ba1f55c404 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Tue, 4 Jun 2019 12:25:41 +0200 Subject: [PATCH 09/32] Add module name and branch name to yaml file --- nginx.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nginx.yaml b/nginx.yaml index 7d33dd9..bbbb889 100644 --- a/nginx.yaml +++ b/nginx.yaml @@ -1,6 +1,8 @@ document: modulemd version: 2 data: + name: nginx + stream: mainline summary: nginx webserver description: nginx mainline webserver module license: From 007a48ee4ec5d9d0b9df419b80663bda1cc2f65a Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Thu, 11 Jul 2019 12:02:23 -0400 Subject: [PATCH 10/32] 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 bbbb889..101ca29 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 bced01ea084f5bbd57283e3cb8762dc444cf34b3 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Tue, 23 Jul 2019 22:54:24 -0400 Subject: [PATCH 11/32] update From fbaec0b09960f61a9a68d6ac5ae69f968d6d301f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 12 Aug 2019 15:02:30 +0000 Subject: [PATCH 12/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 041e89cfde43c14234ea11822971bcc4042e58e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 13 Aug 2019 19:58:56 +0000 Subject: [PATCH 13/32] Branching f31 from rawhide Signed-off-by: Fedora Release Engineering From 924abe06db42a9c88b67118bc80139b8746b98dc Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Fri, 16 Aug 2019 11:33:53 -0400 Subject: [PATCH 14/32] 1.17.3 From af96a8c5bc3bfba30ef98f15941cf5d737da76e0 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Wed, 25 Sep 2019 12:23:46 -0400 Subject: [PATCH 15/32] 1.17.4 From ea628f2d57062d3a66bece44fa59320a63335518 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Tue, 22 Oct 2019 15:13:46 -0400 Subject: [PATCH 16/32] 1.17.5 From ce8f5478771bed2c3d1391543ceca2232a1f77b8 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Tue, 19 Nov 2019 19:32:08 -0500 Subject: [PATCH 17/32] 1.17.6 From 725dfb3a7e8d2e548745a46cce60f0fd142367c0 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Tue, 19 Nov 2019 22:27:51 -0500 Subject: [PATCH 18/32] fix sources file From 8e45eed80bc5f096c07a1183dae99f38abe602ee Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Fri, 27 Dec 2019 11:47:41 +0100 Subject: [PATCH 19/32] 1.17.7 From a6ec0ec1fe4ed4933e4fbbc120d6adad1a980b31 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Mon, 20 Jan 2020 10:28:35 -0500 Subject: [PATCH 20/32] remove mailcap dependency for EL From df24325229b85f2a439b614a5a3974d20d0b7336 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Wed, 22 Jan 2020 15:13:38 -0500 Subject: [PATCH 21/32] update to 1.17.8 From 952fb8a15b1f474e328c00468a0ea2cd7af69d70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 6 Feb 2020 18:25:28 +0000 Subject: [PATCH 22/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 6a6fc06ff7d1099ac9ef5a146b8f5f513d8e3774 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 13 Feb 2020 18:09:26 +0000 Subject: [PATCH 23/32] Branching f32 from rawhide Signed-off-by: Fedora Release Engineering From 8aa91020d16326eea72a2171e1ddf7a38dff6f3a Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Thu, 5 Mar 2020 21:14:12 -0500 Subject: [PATCH 24/32] update to 1.17.9 Signed-off-by: Felix Kaechele From a065141dbbf6a0244a6b33dd88c280b69a1e9538 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Wed, 15 Apr 2020 16:18:51 -0400 Subject: [PATCH 25/32] update to 1.17.10 Signed-off-by: Felix Kaechele From 58468d00f899b37e72a81a6adef0aa1e3a0d4b9b Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Fri, 1 May 2020 19:11:30 -0400 Subject: [PATCH 26/32] Create 1.18 stream Signed-off-by: Felix Kaechele --- nginx.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nginx.yaml b/nginx.yaml index 101ca29..b09eb9c 100644 --- a/nginx.yaml +++ b/nginx.yaml @@ -2,9 +2,9 @@ document: modulemd version: 2 data: name: nginx - stream: mainline + stream: 1.18 summary: nginx webserver - description: nginx mainline webserver module + description: nginx 1.18 webserver module license: module: [ MIT ] dependencies: @@ -40,4 +40,4 @@ data: rpms: nginx: rationale: Module API. - ref: stream-mainline + ref: stream-1.18 From e5816af0a92468575a7797aec8041fa9a9833e7e Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 26 Jun 2020 13:10:46 -0400 Subject: [PATCH 27/32] Do not build for EPEL 8. This stream is provided by RHEL 8 Signed-off-by: Stephen Gallagher --- nginx.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.yaml b/nginx.yaml index b09eb9c..fa3321f 100644 --- a/nginx.yaml +++ b/nginx.yaml @@ -9,9 +9,9 @@ data: module: [ MIT ] dependencies: - buildrequires: - platform: [] + platform: [-epel8] requires: - platform: [] + platform: [-epel8] references: documentation: http://nginx.org/en/docs/ tracker: https://trac.nginx.org/nginx/ From 8105bca205b23f226913777e269a62e83a3bc861 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 8 Aug 2020 09:59:57 +0000 Subject: [PATCH 28/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering From f05a0c7dbffa0e78b57202a5bf4565468245907a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Aug 2020 20:05:59 +0000 Subject: [PATCH 29/32] Branching f33 from rawhide Signed-off-by: Fedora Release Engineering From f24dff7b2181b7c6cdf5e582b407d6710f2c0a4c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 3 Feb 2021 18:49:44 +0000 Subject: [PATCH 30/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 45ddaaeff33b1c5662cd083db2f493545e6fe223 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Wed, 19 Jan 2022 12:12:09 -0500 Subject: [PATCH 31/32] Fix el8 exclusion Signed-off-by: Felix Kaechele --- nginx.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.yaml b/nginx.yaml index fa3321f..b45f6ca 100644 --- a/nginx.yaml +++ b/nginx.yaml @@ -9,9 +9,9 @@ data: module: [ MIT ] dependencies: - buildrequires: - platform: [-epel8] + platform: [-el8] requires: - platform: [-epel8] + platform: [-el8] references: documentation: http://nginx.org/en/docs/ tracker: https://trac.nginx.org/nginx/ From 9703184b53d6d90d5b0ca53a36e8527d4e57256e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 10 Aug 2022 16:47:19 +0000 Subject: [PATCH 32/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering