diff --git a/_attribute b/_attribute index 091c63a..4911319 100644 --- a/_attribute +++ b/_attribute @@ -7,7 +7,7 @@ boo#1094987: '20221026' boo#1172073: '20220918' boo#1183454: '20230105' - boo#1190434: '20230214' + boo#1190434: '20230226' boo#1190823: '20220409' boo#1196201: '20220525' boo#1196335: '20220524' @@ -20,7 +20,7 @@ boo#1197521: '20220403' boo#1197638: '20220404' boo#1197704: '20220517' - boo#1197719: '20230214' + boo#1197719: '20230226' boo#1197931: '20220412' boo#1198150: '20220421' boo#1198169: '20220413' @@ -44,7 +44,7 @@ boo#1200893: '20220718' boo#1200894: '20221102' boo#1201054: '20220711' - boo#1201057: '20230214' + boo#1201057: '20230226' boo#1201082: '20220711' boo#1201348: '20220714' boo#1201349: '20220719' @@ -73,48 +73,51 @@ boo#1204604: '20221109' boo#1204605: '20221022' boo#1204629: '20221024' - boo#1204833: '20230214' + boo#1204833: '20230226' boo#1205020: '20221104' boo#1205032: '20221110' boo#1205312: '20221113' - boo#1205314: '20230214' + boo#1205314: '20230226' boo#1205362: '20221113' boo#1205363: '20230119' boo#1205425: '20221120' boo#1205540: '20221123' boo#1205560: '20221124' boo#1205626: '20221127' - boo#1205633: '20230208' + boo#1205633: '20230226' boo#1205675: '20221128' boo#1205699: '20221124' boo#1205745: '20221128' boo#1205789: '20230201' - boo#1205897: '20230204' + boo#1205897: '20230222' boo#1205918: '20221202' - boo#1206230: '20230214' + boo#1206230: '20230226' boo#1206237: '20221219' boo#1206431: '20221215' boo#1206600: '20221222' - boo#1206614: '20230214' + boo#1206614: '20230226' boo#1206949: '20230119' boo#1207382: '20230123' - boo#1207384: '20230213' - boo#1207385: '20230214' - boo#1207386: '20230214' - boo#1207390: '20230214' + boo#1207384: '20230219' + boo#1207385: '20230226' + boo#1207386: '20230226' + boo#1207390: '20230225' boo#1207509: '20230126' boo#1207524: '20230125' boo#1207567: '20230125' - boo#1207892: '20230214' - boo#1207940: '20230214' + boo#1207892: '20230226' + boo#1207940: '20230226' boo#1207988: '20230207' - boo#1208170: '20230214' + boo#1208170: '20230226' boo#1208217: '20230213' + boo#1208465: '20230222' + boo#1208492: '20230224' + boo#1208636: '20230223' boo#12345: '20221004' boo#978027: '20230213' bsc#1161276: '20221027' bsc#1191684: '20220827' - bsc#1198101: '20230214' + bsc#1198101: '20230226' bsc#1198235: '20220503' bsc#1204279: '20221021' gh#os-autoinst/opensuse-jobgroups#180: '20220728' @@ -163,7 +166,7 @@ poo#114923: '20220809' poo#114986: '20220804' poo#115115: '20220817' - poo#115133: '20230214' + poo#115133: '20230225' poo#115274: '20221003' poo#115313: '20220816' poo#115364: '20220822' @@ -189,14 +192,14 @@ poo#117559: '20221013' poo#117643: '20221006' poo#117688: '20221012' - poo#117811: '20230214' + poo#117811: '20230226' poo#118888: '20221108' poo#119833: '20221102' poo#119926: '20230125' poo#120315: '20221110' poo#120318: '20221110' poo#120345: '20221114' - poo#120459: '20230214' + poo#120459: '20230226' poo#120693: '20221116' poo#120832: '20230214' poo#120834: '20230209' @@ -204,7 +207,7 @@ poo#120984: '20221129' poo#120985: '20221128' poo#121198: '20221215' - poo#121708: '20230214' + poo#121708: '20230226' poo#121789: '20221212' poo#121798: '20221220' poo#121915: '20221212' @@ -214,20 +217,20 @@ poo#122557: '20230118' poo#122776: '20230110' poo#122809: '20230111' - poo#122926: '20230214' - poo#123127: '20230214' + poo#122926: '20230226' + poo#123127: '20230226' poo#123577: '20230124' poo#123637: '20230126' - poo#123739: '20230214' + poo#123739: '20230219' poo#123763: '20230206' poo#123855: '20230131' poo#123918: '20230205' - poo#123924: '20230214' + poo#123924: '20230224' poo#124077: '20230209' poo#124322: '20230212' poo#124323: '20230212' poo#124364: '20230212' - poo#124433: '20230214' + poo#124433: '20230225' poo#63397: '20220921' poo#80628: '20230213' poo#99312: '20220502' @@ -273,7 +276,7 @@ rebuildpacs-leafs = branding-openSUSE PackageKit-branding-openSUSE xfce4-brandin s/openSUSE-/openSUSE-Staging:$LETTER-/ - 20230215 + 20230226 arch: x86_64 @@ -427,6 +430,8 @@ products: - x86_64 - cdi-uploadserver-container: - x86_64 + - distrobox-image: + - x86_64 - cups-image: - x86_64 - go1.16-devel-container: @@ -572,10 +577,10 @@ test_subproject: ToTest set_snapshot_number: True - failed: '' -published: '20230214' -publishing: '20230214' -testing: '20230214' + failed: '20230226' +published: '20230225' +publishing: '20230225' +testing: '20230226' diff --git a/_config b/_config index 0e25135..bcdbf21 100644 --- a/_config +++ b/_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:20230119 +ExpandFlags: macroserial:20230220 ExpandFlags: kiwi-nobasepackages ExpandFlags: docker-nobasepackages @@ -86,14 +86,14 @@ Macros: %if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:Live" || "%_project" == "openSUSE:Factory:NonFree" || "%_project" == "openSUSE:Factory:LegacyX86" Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-openSUSE container-build-checks-strict -Substitute: system-packages:docker kmod kernel-default docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict -Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE container-build-checks-strict +Substitute: system-packages:docker kmod kernel-default docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skope umoci +Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci %else # That ignore seems not to make sense - we only inject -strict based on specific projects already Ignore: container-build-checks-strict Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-openSUSE -Substitute: system-packages:docker kmod kernel-default docker createrepo_c container-build-checks-vendor-openSUSE -Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE +Substitute: system-packages:docker kmod kernel-default docker createrepo_c container-build-checks-vendor-openSUSE skopeo umoci +Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE skopeo umoci %endif %if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:zSystems" || "%_project" == "openSUSE:Factory:LegacyX86" @@ -491,6 +491,7 @@ Prefer: cmake-mini Ignore: python38-pip:ca-certificates Ignore: python39-pip:ca-certificates Ignore: python310-pip:ca-certificates +Ignore: python311-pip:ca-certificates Prefer: -suse-build-key # Set postfix as the 'default' smtp_daemon (virtual symbol provided by all MTAs) @@ -517,12 +518,13 @@ Prefer: -python38-magic -python39-magic -python310-magic Prefer: -gcr3-ssh-agent -gcr3-viewer # have choice for python3-Cython: python310-Cython python310-Cython3 -Prefer: -python310-Cython3 python39-Cython3 -python38-Cython3 +Prefer: -python310-Cython3 python39-Cython3 -python38-Cython3 -python311-Cython3 Prefer: -procps4 # have choice for (python36-qt5 or python36-PyQt6) needed by python36-pytest-qt Prefer: -python310-PyQt6 -python39-PyQt6 -python38-PyQt6 -python3-pyside2 +Prefer: -python311-PyQt6 # man and mandoc provide man; mandoc claims to be lightweight, but it was never discussed to be the new default Prefer: man @@ -536,7 +538,7 @@ Prefer: kernel-default-base Prefer: -kubernetes1.20-kubelet-common -kubernetes1.21-kubelet-common -kubernetes1.22-kubelet-common -kubernetes1.23-client-common # have choice for html2text -Prefer: -python38-html2text -python39-html2text -python310-html2text +Prefer: -python38-html2text -python39-html2text -python310-html2text -python311-html2text # have choice for (gnome-session or budgie-desktop) needed by gnome-shell: budgie-desktop gnome-session Prefer: -budgie-desktop @@ -572,7 +574,8 @@ Prefer: -pipewire-libjack-0_3-devel libjack0 Prefer: -python310-softlayer-zeep # There is python[23]-prompt_toolkit and also python3-prompt_toolkit1 for compat. Use the unversioned one by default -Prefer: python39-prompt_toolkit python38-prompt_toolkit python310-prompt_toolkit +Prefer: -python39-prompt_toolkit1 -python38-prompt_toolkit1 -python310-prompt_toolkit1 +Prefer: -python311-prompt_toolkit1 # When perl provides a module that is also in a different package, but the consumer specifies no version, we go with perl/perl-base Prefer: perl-base perl @@ -952,6 +955,7 @@ 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 Prefer: ruby3.1-rubygem-fast_gettext +Prefer: ruby3.2-rubygem-fast_gettext Prefer: -ruby3.1-rubygem-public_suffix-3.1 Prefer: -ruby3.2-rubygem-public_suffix-3.1 @@ -1351,26 +1355,28 @@ Macros: ### Things to define default ruby stuff for the distro -%rb_default_ruby ruby31 -%rb_default_ruby_suffix ruby3.1 -%rb_default_ruby_abi ruby:3.1.0 +%rb_default_ruby ruby32 +%rb_default_ruby_suffix ruby3.2 +%rb_default_ruby_abi ruby:3.2.0 -%rb_build_ruby_abis ruby:3.1.0 -%rb_build_versions ruby31 +%rb_build_ruby_abis ruby:3.2.0 ruby:3.1.0 +%rb_build_versions ruby32 ruby31 :Macros Macros: %_with_ruby31 1 +%_with_ruby32 1 :Macros %define _with_ruby31 1 +%define _with_ruby32 1 -%define rb_default_ruby ruby31 -%define rb_default_ruby_suffix ruby3.1 -%define rb_default_ruby_abi ruby:3.1.0 +%define rb_default_ruby ruby32 +%define rb_default_ruby_suffix ruby3.2 +%define rb_default_ruby_abi ruby:3.2.0 -%define rb_build_ruby_abis ruby:3.1.0 -%define rb_build_versions ruby31 +%define rb_build_ruby_abis ruby:3.2.0 ruby:3.1.0 +%define rb_build_versions ruby32 ruby31 Prefer: %{rb_default_ruby_suffix}-rubygem-asciidoctor Prefer: %{rb_default_ruby_suffix}-rubygem-bundler @@ -1400,7 +1406,7 @@ Macros: ## PYTHON MACROS BEGIN # order of %pythons is important: The last flavor overrides any operation on conflicting files and definitions during expansions, # making it the "default" in many cases --> keep the primary python3 provider at the end. -%pythons %{?!skip_python3:%{?!skip_python38:python38} %{?!skip_python39:python39} %{?!skip_python310:python310}} +%pythons %{?!skip_python3:%{?!skip_python38:python38} %{?!skip_python39:python39} %{?!skip_python311:python311} %{?!skip_python310:python310}} %add_python() %{expand:%%define pythons %1 %pythons} %_without_python2 1 diff --git a/_staging_workflow b/_staging_workflow index 9f84620..d47c6de 100644 --- a/_staging_workflow +++ b/_staging_workflow @@ -16,18 +16,26 @@ - - - - - + + + + + - + + + + + - + + - - + + + + - + +