fix build failure due to ruby updated to version 3.1.3

This commit is contained in:
wang--ge 2023-01-17 18:44:50 +08:00
parent 9a428ae42b
commit e7f4242f29

View File

@ -17,9 +17,10 @@
%global rake_version 13.0.6 %global rake_version 13.0.6
%global rack_version 2.2.3 %global rack_version 2.2.3
%global ruby_version 3.1.0
Name: obs-bundled-gems Name: obs-bundled-gems
Version: 2.10.1 Version: 2.10.15
Release: 6 Release: 1
Summary: The Open Build Service -- Bundled Gems Summary: The Open Build Service -- Bundled Gems
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
@ -89,14 +90,14 @@ export QA_SKIP_BUILD_ROOT=1
bundle --local --path %{buildroot}%_libdir/obs-api/ bundle --local --path %{buildroot}%_libdir/obs-api/
# test that the rake and rack macros is still matching our Gemfile # test that the rake and rack macros is still matching our Gemfile
test -f %{buildroot}%_libdir/obs-api/ruby/3.0.0/gems/rake-%{rake_version}/rake.gemspec test -f %{buildroot}%_libdir/obs-api/ruby/%{ruby_version}/gems/rake-%{rake_version}/rake.gemspec
test -f %{buildroot}%_libdir/obs-api/ruby/3.0.0/gems/rack-%{rack_version}/rack.gemspec test -f %{buildroot}%_libdir/obs-api/ruby/%{ruby_version}/gems/rack-%{rack_version}/rack.gemspec
# run gem clean up script # run gem clean up script
/usr/lib/rpm/gem_build_cleanup.sh %{buildroot}%_libdir/obs-api/ruby/*/ /usr/lib/rpm/gem_build_cleanup.sh %{buildroot}%_libdir/obs-api/ruby/*/
# work around sassc bug - and install libsass # work around sassc bug - and install libsass
sassc_dir=$(ls -1d %{buildroot}%_libdir/obs-api/ruby/3.0.0/gems/sassc-2*) sassc_dir=$(ls -1d %{buildroot}%_libdir/obs-api/ruby/%{ruby_version}/gems/sassc-2*)
install -D -m 755 $sassc_dir/ext/libsass.so $sassc_dir/lib/sassc install -D -m 755 $sassc_dir/ext/libsass.so $sassc_dir/lib/sassc
sed -i -e 's,/ext/libsass,,' $sassc_dir/lib/sassc/native.rb sed -i -e 's,/ext/libsass,,' $sassc_dir/lib/sassc/native.rb
@ -139,6 +140,10 @@ done
%doc README %doc README
%changelog %changelog
* Tue Jan 17 2023 Ge Wang <wangge20@h-partners.com> 2.10.15-1
- Fix build failure due tu ruby updated to version 3.1.3
- Modify version to match version of obs-server
* Mon May 23 2022 wangkai <wangkai385@h-partners.com> 2.10.1-6 * Mon May 23 2022 wangkai <wangkai385@h-partners.com> 2.10.1-6
- Update gem version for obs-server 2.10.15 - Update gem version for obs-server 2.10.15