From 4bc804e37321fca2d07c2fa7e954a3edfd5d3108 Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Wed, 30 Oct 2024 10:55:44 -0400 Subject: [PATCH 1/3] specify more specific versions of httpd for el 8 & 9 --- packages/ondemand-runtime/rpm/ondemand-runtime.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/ondemand-runtime/rpm/ondemand-runtime.spec b/packages/ondemand-runtime/rpm/ondemand-runtime.spec index e5c3beb..12ee480 100644 --- a/packages/ondemand-runtime/rpm/ondemand-runtime.spec +++ b/packages/ondemand-runtime/rpm/ondemand-runtime.spec @@ -104,14 +104,18 @@ Meta package for pulling in SCL nodejs %{nodejs} %package -n ondemand-apache Summary: Meta package for pulling in SCL apache %{apache} +%if 0%{?rhel} == 8 +Requires: %{apache} > 2.4.37-56, %{apache} < 2.5 +%endif +%if 0%{?rhel} == 9 +Requires: %{apache} > 2.4.57-8, %{apache} < 2.5 +%endif %if 0%{?rhel} >= 8 -Requires: %{apache} >= 2.4, %{apache} < 2.5 Requires: httpd-devel Requires: mod_ssl Requires: mod_ldap %endif %if 0%{?amzn} == 2023 -Requires: %{apache} >= 2.4, %{apache} < 2.5 Requires: httpd-devel Requires: mod_ssl Requires: mod_ldap From 6b5d186734983153357a14f93933db980769b155 Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Wed, 30 Oct 2024 10:59:41 -0400 Subject: [PATCH 2/3] amazon should keep its requirement --- packages/ondemand-runtime/rpm/ondemand-runtime.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/ondemand-runtime/rpm/ondemand-runtime.spec b/packages/ondemand-runtime/rpm/ondemand-runtime.spec index 12ee480..88c0123 100644 --- a/packages/ondemand-runtime/rpm/ondemand-runtime.spec +++ b/packages/ondemand-runtime/rpm/ondemand-runtime.spec @@ -116,6 +116,7 @@ Requires: mod_ssl Requires: mod_ldap %endif %if 0%{?amzn} == 2023 +Requires: %{apache} >= 2.4, %{apache} < 2.5 Requires: httpd-devel Requires: mod_ssl Requires: mod_ldap From 8f0919a3142fcb2ba779e5a8bc74ea407234ad79 Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Fri, 1 Nov 2024 10:05:20 -0400 Subject: [PATCH 3/3] bump version --- lib/ood_packaging/version.rb | 2 +- release-manifest.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ood_packaging/version.rb b/lib/ood_packaging/version.rb index 193ad3b..6e9859f 100644 --- a/lib/ood_packaging/version.rb +++ b/lib/ood_packaging/version.rb @@ -12,7 +12,7 @@ module OodPackaging '(ubuntu|debian)' => '4', 'default' => '1-8' }, - 'ondemand-runtime' => '3.1.5', + 'ondemand-runtime' => '3.1.6', 'scl-utils' => '2.0.3', 'passenger' => '6.0.20', 'cjose' => '0.6.1', diff --git a/release-manifest.yaml b/release-manifest.yaml index 7a219a8..f09379d 100644 --- a/release-manifest.yaml +++ b/release-manifest.yaml @@ -1,6 +1,6 @@ major: '3.1' full: '3.1.9' -runtime: '3.1.5' +runtime: '3.1.6' # release ondemand-release: