From a95402688a0b99d601eb196674cbec4265e94ac4 Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Thu, 7 Nov 2024 08:34:07 -0500 Subject: [PATCH] Fix Ruby and NodeJS version requirements in ondemand-runtime --- packages/ondemand-runtime/rpm/ondemand-runtime.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ondemand-runtime/rpm/ondemand-runtime.spec b/packages/ondemand-runtime/rpm/ondemand-runtime.spec index 88c0123..b491f31 100644 --- a/packages/ondemand-runtime/rpm/ondemand-runtime.spec +++ b/packages/ondemand-runtime/rpm/ondemand-runtime.spec @@ -8,7 +8,7 @@ %global ruby ruby %global nodejs nodejs %global apache httpd -%global ruby_version 3.1 +%global ruby_version 3.3 %endif %if 0%{?amzn} == 2023 %global ruby ruby3.2 @@ -58,7 +58,7 @@ packages depending on %{scl} Software Collection. %package -n ondemand-ruby Summary: Meta package for pulling in SCL Ruby %{ruby} %if 0%{?rhel} >= 8 -Requires: %{ruby} >= 3.1, %{ruby} < 3.2 +Requires: %{ruby} >= 3.3, %{ruby} < 3.4 Requires: rubygem-rake Requires: rubygem-bundler >= 2.1 Requires: ruby-devel @@ -87,11 +87,11 @@ Meta package for pulling in SCL Ruby %{ruby} %package -n ondemand-nodejs Summary: Meta package for pulling in SCL nodejs %{nodejs} %if 0%{?rhel} == 9 -Requires: %{nodejs} >= 1:18.0, %{nodejs} < 1:19.0 +Requires: %{nodejs} >= 1:20.0, %{nodejs} < 1:21.0 Requires: npm %endif %if 0%{?rhel} == 8 -Requires: %{nodejs} >= 1:18.0, %{nodejs} < 1:19.0 +Requires: %{nodejs} >= 1:20.0, %{nodejs} < 1:21.0 Requires: npm %endif %if 0%{?amzn} == 2023