From 877cf7d85fd9a80b4a4ada768af52c363a1fd939 Mon Sep 17 00:00:00 2001 From: wang--ge Date: Sat, 12 Aug 2023 14:27:33 +0800 Subject: [PATCH] fix build failure due to ruby updated to version 3.2 --- Gemfile.lock.aarch64 | 4 ++-- Gemfile.lock.riscv64 | 2 +- Gemfile.lock.x86 | 4 ++-- obs-server.spec | 7 ++++++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock.aarch64 b/Gemfile.lock.aarch64 index ab7981b..78ec12f 100644 --- a/Gemfile.lock.aarch64 +++ b/Gemfile.lock.aarch64 @@ -256,7 +256,7 @@ GEM mysql2 (0.5.3) netrc (0.11.0) nio4r (2.5.8) - nokogiri (1.13.4-aarch64-linux) + nokogiri (1.13.4) racc (~> 1.4) parallel (1.21.0) parser (3.1.1.0) @@ -585,4 +585,4 @@ DEPENDENCIES yajl-ruby BUNDLED WITH - 2.3.26 + 2.4.10 diff --git a/Gemfile.lock.riscv64 b/Gemfile.lock.riscv64 index 1cfbcb3..befb355 100644 --- a/Gemfile.lock.riscv64 +++ b/Gemfile.lock.riscv64 @@ -586,4 +586,4 @@ DEPENDENCIES yajl-ruby BUNDLED WITH - 2.3.26 + 2.4.10 diff --git a/Gemfile.lock.x86 b/Gemfile.lock.x86 index 2c4eb3e..ea61fbd 100644 --- a/Gemfile.lock.x86 +++ b/Gemfile.lock.x86 @@ -256,7 +256,7 @@ GEM mysql2 (0.5.3) netrc (0.11.0) nio4r (2.5.8) - nokogiri (1.13.4-x86_64-linux) + nokogiri (1.13.4) racc (~> 1.4) parallel (1.21.0) parser (3.1.1.0) @@ -585,4 +585,4 @@ DEPENDENCIES yajl-ruby BUNDLED WITH - 2.3.26 + 2.4.10 diff --git a/obs-server.spec b/obs-server.spec index a31c5ba..0866f12 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -6,7 +6,7 @@ Name: obs-server Version: 2.10.15 -Release: 6 +Release: 7 Summary: The Open Build Service -- Server Component License: GPL-2.0-only OR GPL-3.0-only 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: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 +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 export DESTDIR=$RPM_BUILD_ROOT @@ -521,6 +523,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/rcobsstoragesetup %changelog +* Sat Aug 12 2023 Ge Wang - 2.10.15-7 +- Fix build failure due to ruby updated to version 3.2 + * Fri Mar 17 2023 misaka00251 - 2.10.15-6 - Fix build on riscv64 -- Gitee