From 590ecec055d1001ff444f873eff9479f33781408 Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Thu, 8 Feb 2024 16:09:51 -0500 Subject: [PATCH] remove RPM dependency on ondemand-gems (#115) --- packaging/ondemand-systemstatus.spec | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/packaging/ondemand-systemstatus.spec b/packaging/ondemand-systemstatus.spec index eab65bb..2fa7374 100644 --- a/packaging/ondemand-systemstatus.spec +++ b/packaging/ondemand-systemstatus.spec @@ -3,8 +3,7 @@ %global repo_name osc-systemstatus %global app_name systemstatus %global with_passenger 1 -%define ondemand_gems_ver %(rpm --qf "%%{version}-%%{release}" -q ondemand-gems | sed -r 's/.el.+//g') -%global gem_home %{scl_ondemand_apps_gem_home}/%{app_name} + %if 0%{?with_passenger} %bcond_without passenger @@ -33,9 +32,7 @@ BuildRequires: ondemand-runtime BuildRequires: ondemand-ruby BuildRequires: ondemand-nodejs BuildRequires: ondemand-scldevel -BuildRequires: ondemand-gems Requires: ondemand -Requires: ondemand-gems-%{ondemand_gems_ver} # Disable automatic dependencies as it causes issues with bundled gems and # node.js packages used in the apps @@ -55,17 +52,12 @@ scl enable ondemand - << \EOS export PASSENGER_APP_ENV=production export PASSENGER_BASE_URI=/pun/sys/%{app_name} %endif -export GEM_HOME=$(pwd)/gems-build -export GEM_PATH=$(pwd)/gems-build:$GEM_PATH +bundle config path --local vendor/bundle bin/setup EOS %install -%__mkdir_p %{buildroot}%{gem_home} -if [ -d ./gems-build ]; then - %__mv ./gems-build/* %{buildroot}%{gem_home}/ -fi %__mkdir_p %{buildroot}%{_localstatedir}/www/ood/apps/sys/%{app_name} %__cp -a ./. %{buildroot}%{_localstatedir}/www/ood/apps/sys/%{app_name}/ @@ -108,7 +100,6 @@ touch %{_localstatedir}/www/ood/apps/sys/%{app_name}/tmp/restart.txt %files %defattr(-,root,root) -%{gem_home} %{_localstatedir}/www/ood/apps/sys/%{app_name} %{_localstatedir}/www/ood/apps/sys/%{app_name}/manifest.yml %if %{with passenger}