2
2
%global debug_package %{nil }
3
3
%global repo_name frame-renderer
4
4
%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 }
7
5
8
6
%{! ?package_release: %define package_release 1}
9
7
%{! ?git_tag: %define git_tag v%{package_version }}
@@ -26,9 +24,8 @@ BuildRequires: ondemand-runtime
26
24
BuildRequires: ondemand-ruby
27
25
BuildRequires: ondemand-nodejs
28
26
BuildRequires: ondemand-scldevel
29
- BuildRequires: ondemand-gems
30
27
Requires: ondemand
31
- Requires: ondemand-gems-%{ ondemand_gems_ver }
28
+
32
29
33
30
# Disable automatic dependencies as it causes issues with bundled gems and
34
31
# node.js packages used in the apps
@@ -43,17 +40,13 @@ DESCRIPTION
43
40
44
41
%build
45
42
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
48
44
export PASSENGER_APP_ENV=production
49
45
export SECRET_KEY_BASE=$( cat /dev/urandom | tr -dc ' a-zA-Z0-9' | fold -w 128 | head -n 1)
50
46
bin/setup
51
47
EOS
52
48
53
49
%install
54
- %__mkdir_p %{buildroot }%{gem_home }
55
- %__mv ./gems-build/* %{buildroot }%{gem_home }/
56
-
57
50
%__rm ./log/production.log
58
51
%__mkdir_p %{buildroot }%{_localstatedir }/www/ood/apps/sys/%{app_name }
59
52
%__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
91
84
92
85
%files
93
86
%defattr(-,root,root)
94
- %{gem_home }
95
87
%{_localstatedir }/www/ood/apps/sys/%{app_name }
96
88
%{_localstatedir }/www/ood/apps/sys/%{app_name }/manifest.yml
97
89
%ghost %{_localstatedir }/www/ood/apps/sys/%{app_name }/tmp/restart.txt
0 commit comments