Skip to content

Commit

Permalink
[dist] switch to ruby 2.2.0 api
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianschroeter committed Jun 19, 2015
1 parent 5214253 commit af26aae
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion dist/obs-api-deps.spec
Expand Up @@ -38,7 +38,7 @@ This package serves one purpose only: to list the dependencies in Gemfile.lock
Summary: The Open Build Service -- The Testsuite dependencies
Group: Productivity/Networking/Web/Utilities
# dependencies not needed in production
Requires: %(echo `bash %{S:1} %{S:0} "ruby:2.1.0"`)
Requires: %(echo `bash %{S:1} %{S:0} "ruby:2.2.0"`)

Requires: perl-BSSolv >= 0.18.0
# Required by source server
Expand Down
8 changes: 4 additions & 4 deletions dist/obs-server.spec
Expand Up @@ -181,7 +181,7 @@ BuildRequires: xorg-x11-server
BuildRequires: xorg-x11-server-extra
# write down dependencies for production
BuildRequires: rubygem(bundler)
Requires: %(echo `bash %{S:1} %{S:0} "ruby:2.1.0"`)
Requires: %(echo `bash %{S:1} %{S:0} "ruby:2.2.0"`)
# for rebuild_time
Requires: perl(GD)

Expand Down Expand Up @@ -413,9 +413,9 @@ EOF

%if 0%{?suse_version}
# adapt to SUSE style ruby parallel installation
find %{buildroot} -executable -a -type f | while read file; do
sed -i -s 's,^#!/usr/bin/env ruby$,#!/usr/bin/env ruby.ruby2.1,' "$file"
done
#find %{buildroot} -executable -a -type f | while read file; do
# sed -i -s 's,^#!/usr/bin/env ruby$,#!/usr/bin/env ruby.ruby2.1,' "$file"
#done
%endif

%check
Expand Down

0 comments on commit af26aae

Please sign in to comment.