From 80953b61f4b06adf4362b6409180af5ef79e73c0 Mon Sep 17 00:00:00 2001 From: Bernhard M. Wiedemann Date: Jan 30 2022 00:43:12 +0000 Subject: update 2022-01-30 00:43 --- diff --git a/packages/_/_project/_attribute b/packages/_/_project/_attribute index af52e01..f0750f9 100644 --- a/packages/_/_project/_attribute +++ b/packages/_/_project/_attribute @@ -128,7 +128,7 @@ bad-rpmlint-entries = suse-dbus-unauthorized-service suse-pam-unauthorized-modul s/openSUSE-/openSUSE-Staging:$LETTER-/ - 20220128 + 20220129 arch: x86_64 diff --git a/packages/_/_project/_config b/packages/_/_project/_config index dc901e6..08bde68 100644 --- a/packages/_/_project/_config +++ b/packages/_/_project/_config @@ -7,7 +7,7 @@ BuildFlags: genmetaalgo:1 # The prjconf macros have a serial to help work around issues like https://github.com/openSUSE/open-build-service/issues/4088 # On macros having impact on dep chains, update the serial (mainly ruby, python) # Using a date to indicate when we set the serial -ExpandFlags: macroserial:20220107 +ExpandFlags: macroserial:20220129 ExpandFlags: kiwi-nobasepackages ExpandFlags: docker-nobasepackages @@ -1325,30 +1325,26 @@ Macros: ### Things to define default ruby stuff for the distro -%rb_default_ruby ruby30 -%rb_default_ruby_suffix ruby3.0 -%rb_default_ruby_abi ruby:3.0.0 +%rb_default_ruby ruby31 +%rb_default_ruby_suffix ruby3.1 +%rb_default_ruby_abi ruby:3.1.0 -%rb_build_ruby_abis ruby:2.7.0 ruby:3.0.0 -%rb_build_versions ruby27 ruby30 +%rb_build_ruby_abis ruby:3.1.0 +%rb_build_versions ruby31 :Macros -%if "%{_project}" != "openSUSE:Factory:Staging:L" Macros: -%_with_ruby27 1 -%_with_ruby30 1 +%_with_ruby31 1 :Macros -%define _with_ruby27 1 -%define _with_ruby30 1 -%endif +%define _with_ruby31 1 -%define rb_default_ruby ruby30 -%define rb_default_ruby_suffix ruby3.0 -%define rb_default_ruby_abi ruby:3.0.0 +%define rb_default_ruby ruby31 +%define rb_default_ruby_suffix ruby3.1 +%define rb_default_ruby_abi ruby:3.1.0 -%define rb_build_ruby_abis ruby:2.7.0 ruby:3.0.0 -%define rb_build_versions ruby27 ruby30 +%define rb_build_ruby_abis ruby:3.1.0 +%define rb_build_versions ruby31 Prefer: %{rb_default_ruby_suffix}-rubygem-asciidoctor Prefer: %{rb_default_ruby_suffix}-rubygem-bundler diff --git a/packages/_/_project/_staging_workflow b/packages/_/_project/_staging_workflow index d1f6bef..b564068 100644 --- a/packages/_/_project/_staging_workflow +++ b/packages/_/_project/_staging_workflow @@ -31,36 +31,13 @@ - - - - - - - - - - - - - - - + + - - - - - - - - - -