Skip to content

Commit

Permalink
remove RPM dependency on ondemand-gems (#115)
Browse files Browse the repository at this point in the history
  • Loading branch information
johrstrom authored Feb 8, 2024
1 parent 0b17d15 commit 590ecec
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions packaging/ondemand-systemstatus.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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}/
Expand Down Expand Up @@ -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}
Expand Down

0 comments on commit 590ecec

Please sign in to comment.