Skip to content

Commit 64d59a5

Browse files
authored
Vendor gems (#138)
* vendor/bundle gems and rm dependency on ondemand-gems * rm this from files as well
1 parent 5c7c722 commit 64d59a5

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

packaging/frame_renderer.spec

+2-10
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
%global debug_package %{nil}
33
%global repo_name frame-renderer
44
%global app_name frame-renderer
5-
%define ondemand_gems_ver %(rpm --qf "%%{version}-%%{release}" -q ondemand-gems | sed -r 's/.el.+//g')
6-
%global gem_home %{scl_ondemand_apps_gem_home}/%{app_name}
75

86
%{!?package_release: %define package_release 1}
97
%{!?git_tag: %define git_tag v%{package_version}}
@@ -26,9 +24,8 @@ BuildRequires: ondemand-runtime
2624
BuildRequires: ondemand-ruby
2725
BuildRequires: ondemand-nodejs
2826
BuildRequires: ondemand-scldevel
29-
BuildRequires: ondemand-gems
3027
Requires: ondemand
31-
Requires: ondemand-gems-%{ondemand_gems_ver}
28+
3229

3330
# Disable automatic dependencies as it causes issues with bundled gems and
3431
# node.js packages used in the apps
@@ -43,17 +40,13 @@ DESCRIPTION
4340

4441
%build
4542
scl enable ondemand - << \EOS
46-
export GEM_HOME=$(pwd)/gems-build
47-
export GEM_PATH=$(pwd)/gems-build:$GEM_PATH
43+
bundle config path --local vendor/bundle
4844
export PASSENGER_APP_ENV=production
4945
export SECRET_KEY_BASE=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 128 | head -n 1)
5046
bin/setup
5147
EOS
5248

5349
%install
54-
%__mkdir_p %{buildroot}%{gem_home}
55-
%__mv ./gems-build/* %{buildroot}%{gem_home}/
56-
5750
%__rm ./log/production.log
5851
%__mkdir_p %{buildroot}%{_localstatedir}/www/ood/apps/sys/%{app_name}
5952
%__cp -a ./. %{buildroot}%{_localstatedir}/www/ood/apps/sys/%{app_name}/
@@ -91,7 +84,6 @@ touch %{_localstatedir}/www/ood/apps/sys/%{app_name}/tmp/restart.txt
9184

9285
%files
9386
%defattr(-,root,root)
94-
%{gem_home}
9587
%{_localstatedir}/www/ood/apps/sys/%{app_name}
9688
%{_localstatedir}/www/ood/apps/sys/%{app_name}/manifest.yml
9789
%ghost %{_localstatedir}/www/ood/apps/sys/%{app_name}/tmp/restart.txt

0 commit comments

Comments
 (0)