packages/obs-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!127 Fix build failure due to ruby updated to version 3.2

Browse Source 
From: @wang--ge 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2023-08-12 08:22:52 +00:00 committed by Gitee
commit 0d3ebb9ae4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile.lock.aarch64
View File

@ -256,7 +256,7 @@ GEM
mysql2 (0.5.3) mysql2 (0.5.3)
netrc (0.11.0) netrc (0.11.0)
nio4r (2.5.8) nio4r (2.5.8)
nokogiri (1.13.4-aarch64-linux) nokogiri (1.13.4)
racc (~> 1.4) racc (~> 1.4)
parallel (1.21.0) parallel (1.21.0)
parser (3.1.1.0) parser (3.1.1.0)
@ -585,4 +585,4 @@ DEPENDENCIES
yajl-ruby yajl-ruby
BUNDLED WITH BUNDLED WITH
2.3.26 2.4.10

2
Gemfile.lock.riscv64
View File

@ -586,4 +586,4 @@ DEPENDENCIES
yajl-ruby yajl-ruby
BUNDLED WITH BUNDLED WITH
2.3.26 2.4.10

4
Gemfile.lock.x86
View File

@ -256,7 +256,7 @@ GEM
mysql2 (0.5.3) mysql2 (0.5.3)
netrc (0.11.0) netrc (0.11.0)
nio4r (2.5.8) nio4r (2.5.8)
nokogiri (1.13.4-x86_64-linux) nokogiri (1.13.4)
racc (~> 1.4) racc (~> 1.4)
parallel (1.21.0) parallel (1.21.0)
parser (3.1.1.0) parser (3.1.1.0)
@ -585,4 +585,4 @@ DEPENDENCIES
yajl-ruby yajl-ruby
BUNDLED WITH BUNDLED WITH
2.3.26 2.4.10

7
obs-server.spec
View File

@ -6,7 +6,7 @@
Name: obs-server Name: obs-server
Version: 2.10.15 Version: 2.10.15
Release: 6 Release: 7
Summary: The Open Build Service -- Server Component Summary: The Open Build Service -- Server Component
License: GPL-2.0-only OR GPL-3.0-only License: GPL-2.0-only OR GPL-3.0-only
URL: http://www.openbuildservice.org URL: http://www.openbuildservice.org
@ -100,6 +100,8 @@ sed -i 's/apache2.service/httpd.service/g' `find . -name "obsapisetup.service"`
for file in `find . -name "*.service"`;do sed -i 's:User = wwwrun:User = apache:g' $file;done for file in `find . -name "*.service"`;do sed -i 's:User = wwwrun:User = apache:g' $file;done
for file in `find . -name "*.service"`;do sed -i 's:Group = www:User = apache:g' $file;done for file in `find . -name "*.service"`;do sed -i 's:Group = www:User = apache:g' $file;done
for file in `find . -name "*.service"`;do sed -i 's:/usr/bin/bundle.ruby2.7:/usr/bin/bundle:g' $file;done for file in `find . -name "*.service"`;do sed -i 's:/usr/bin/bundle.ruby2.7:/usr/bin/bundle:g' $file;done
sed -i 's/File.exists/File.exist/g' docs/api/restility/lib/rest_htmlprinter.rb
sed -i 's/File.exists/File.exist/g' docs/api/restility/lib/rest.rb
%build %build
export DESTDIR=$RPM_BUILD_ROOT export DESTDIR=$RPM_BUILD_ROOT
@ -521,6 +523,9 @@ usermod -a -G docker obsservicerun
%{_sbindir}/rcobsstoragesetup %{_sbindir}/rcobsstoragesetup
%changelog %changelog
* Sat Aug 12 2023 Ge Wang <wang__ge@126.com> - 2.10.15-7
- Fix build failure due to ruby updated to version 3.2
* Fri Mar 17 2023 misaka00251 <liuxin@iscas.ac.cn> - 2.10.15-6 * Fri Mar 17 2023 misaka00251 <liuxin@iscas.ac.cn> - 2.10.15-6
- Fix build on riscv64 - Fix build on riscv64