products/SLFO
SHA256
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '_config: move to ruby3.4 (jsc#PED-11721)' (#74) from epaolantonio/SLFO_main:epaolantonio/main-ruby34 into main

Browse Source 
Reviewed-on: https://src.suse.de/products/SLFO/pulls/74
Reviewed-by: Gustavo Yokoyama Ribeiro <gyribeiro@suse.com>
Reviewed-by: Ruediger Oertel <ro@suse.com>
This commit is contained in:
Ruediger Oertel 2025-02-06 17:49:23 +01:00
commit c3d30ac6e6
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
_config
View File

@ -673,8 +673,8 @@ FileProvides: /usr/bin/rm busybox-coreutils coreutils coreutils-single
FileProvides: /bin/rm busybox-coreutils coreutils coreutils-single FileProvides: /bin/rm busybox-coreutils coreutils coreutils-single
FileProvides: /usr/bin/rmdir busybox-coreutils coreutils coreutils-single FileProvides: /usr/bin/rmdir busybox-coreutils coreutils coreutils-single
FileProvides: /usr/bin/rsync rsync FileProvides: /usr/bin/rsync rsync
FileProvides: /usr/bin/ruby ruby3.2 FileProvides: /usr/bin/ruby ruby3.4
FileProvides: /usr/bin/ruby.ruby3.2 ruby3.2 FileProvides: /usr/bin/ruby.ruby3.4 ruby3.4
FileProvides: /usr/bin/runawk runawk FileProvides: /usr/bin/runawk runawk
FileProvides: /usr/bin/scheme-srfi-7 scheme48 FileProvides: /usr/bin/scheme-srfi-7 scheme48
FileProvides: /usr/bin/sed busybox-sed sed FileProvides: /usr/bin/sed busybox-sed sed
@ -1702,8 +1702,8 @@ Prefer: -zvbi-devel-32bit
Prefer: -zziplib-devel-32bit Prefer: -zziplib-devel-32bit
# Ruby stuff - quite a few packages exist in multiple versions in the distro; in each case, the Preference is on the 'unversioned' package # Ruby stuff - quite a few packages exist in multiple versions in the distro; in each case, the Preference is on the 'unversioned' package
Prefer: ruby3.2-rubygem-fast_gettext Prefer: ruby3.4-rubygem-fast_gettext
Prefer: -ruby3.2-rubygem-public_suffix-3.1 Prefer: -ruby3.4-rubygem-public_suffix-3.1
# We have opencv and opencv3 - as usual, the unversioned one should win # We have opencv and opencv3 - as usual, the unversioned one should win
Prefer: opencv-devel Prefer: opencv-devel
@ -3343,7 +3343,7 @@ BuildFlags: onlybuild:rtkit
BuildFlags: onlybuild:ruby BuildFlags: onlybuild:ruby
BuildFlags: onlybuild:ruby-bundled-gems-rpmhelper BuildFlags: onlybuild:ruby-bundled-gems-rpmhelper
BuildFlags: onlybuild:ruby-common BuildFlags: onlybuild:ruby-common
BuildFlags: onlybuild:ruby3.2 BuildFlags: onlybuild:ruby3.4
BuildFlags: onlybuild:rubygem-asciidoctor BuildFlags: onlybuild:rubygem-asciidoctor
BuildFlags: onlybuild:rubygem-gem2rpm BuildFlags: onlybuild:rubygem-gem2rpm
BuildFlags: onlybuild:rubygem-hpricot BuildFlags: onlybuild:rubygem-hpricot
@ -3645,39 +3645,39 @@ Macros:
# IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT # IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
# #
### And now Ruby 3.2 ### And now Ruby 3.4
%rubygemsruby32() rubygem(ruby:3.2.0:%{expand:%%rubygemsx%*} %{expand:%%{rubygems%*}} %rubygemsruby34() rubygem(ruby:3.4.0:%{expand:%%rubygemsx%*} %{expand:%%{rubygems%*}}
%rubygemsxruby32() %{expand:%%{rubygemsx%*}} %rubygemsxruby34() %{expand:%%{rubygemsx%*}}
%rubyruby32() ruby3.2 %{expand:%%rubyx%*} %{expand:%%{ruby%*}} %rubyruby34() ruby3.4 %{expand:%%rubyx%*} %{expand:%%{ruby%*}}
%rubyxruby32() %{expand:%%{rubyx%*}} %rubyxruby34() %{expand:%%{rubyx%*}}
%rubydevelruby32() ruby3.2-devel %{expand:%%rubydevelx%*} %{expand:%%{rubydevel%*}} %rubydevelruby34() ruby3.4-devel %{expand:%%rubydevelx%*} %{expand:%%{rubydevel%*}}
%rubydevelxruby32() %{expand:%%{rubydevelx%*}} %rubydevelxruby34() %{expand:%%{rubydevelx%*}}
### Things to define default ruby stuff for the distro ### Things to define default ruby stuff for the distro
%rb_default_ruby ruby32 %rb_default_ruby ruby34
%rb_default_ruby_suffix ruby3.2 %rb_default_ruby_suffix ruby3.4
%rb_default_ruby_abi ruby:3.2.0 %rb_default_ruby_abi ruby:3.4.0
%rb_build_ruby_abis ruby:3.2.0 %rb_build_ruby_abis ruby:3.4.0
%rb_build_versions ruby32 %rb_build_versions ruby34
:Macros :Macros
Macros: Macros:
%_with_ruby32 1 %_with_ruby34 1
:Macros :Macros
%define _with_ruby32 1 %define _with_ruby34 1
%define rb_default_ruby ruby32 %define rb_default_ruby ruby34
%define rb_default_ruby_suffix ruby3.2 %define rb_default_ruby_suffix ruby3.4
%define rb_default_ruby_abi ruby:3.2.0 %define rb_default_ruby_abi ruby:3.4.0
%define rb_build_ruby_abis ruby:3.2.0 %define rb_build_ruby_abis ruby:3.4.0
%define rb_build_versions ruby32 %define rb_build_versions ruby34
Prefer: %{rb_default_ruby_suffix}-rubygem-asciidoctor Prefer: %{rb_default_ruby_suffix}-rubygem-asciidoctor
Prefer: %{rb_default_ruby_suffix}-rubygem-bundler Prefer: %{rb_default_ruby_suffix}-rubygem-bundler
@ -3693,6 +3693,7 @@ Prefer: %{rb_default_ruby_suffix}-rubygem-sass
Prefer: %{rb_default_ruby_suffix}-rubygem-sass-rails Prefer: %{rb_default_ruby_suffix}-rubygem-sass-rails
Prefer: %{rb_default_ruby_suffix}-rubygem-yard Prefer: %{rb_default_ruby_suffix}-rubygem-yard
Prefer: %{rb_default_ruby_suffix}-rubygem-yast-rake Prefer: %{rb_default_ruby_suffix}-rubygem-yast-rake
Prefer: %{rb_default_ruby_suffix}-rubygem-railties
# END RUBY STUFF # END RUBY STUFF