From 9e1dbdab12563258eafdeeb2e451f04e8da44a65 Mon Sep 17 00:00:00 2001 From: Bernhard M. Wiedemann Date: Jun 15 2022 00:48:31 +0000 Subject: update 2022-06-15 00:48 --- diff --git a/packages/_/_project/_attribute b/packages/_/_project/_attribute index 889d627..7b0fe87 100644 --- a/packages/_/_project/_attribute +++ b/packages/_/_project/_attribute @@ -215,7 +215,7 @@ rebuildpacs-leafs = branding-openSUSE PackageKit-branding-openSUSE xfce4-brandin s/openSUSE-/openSUSE-Staging:$LETTER-/ - 20220613 + 20220614 arch: x86_64 diff --git a/packages/_/_project/_config b/packages/_/_project/_config index 5608c7e..817bbeb 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:20220510 +ExpandFlags: macroserial:20220614 ExpandFlags: kiwi-nobasepackages ExpandFlags: docker-nobasepackages @@ -205,7 +205,7 @@ Substitute: pkg-config pkgconf-pkg-config FileProvides: /usr/bin/glxinfo Mesa-demo-x FileProvides: /usr/bin/python python-base FileProvides: /usr/bin/python2 python2-base -FileProvides: /usr/bin/python3 python38-base +FileProvides: /usr/bin/python3 python310-base FileProvides: /usr/bin/sed busybox-sed sed sed FileProvides: /usr/bin/setfacl acl FileProvides: /usr/bin/sg_inq sg3_utils @@ -1337,7 +1337,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_python39:python39} %{?!skip_python310:python310} %{?!skip_python38:python38}} +%pythons %{?!skip_python3:%{?!skip_python38:python38} %{?!skip_python39:python39} %{?!skip_python310:python310}} %add_python() %{expand:%%define pythons %1 %pythons} %_without_python2 1 diff --git a/packages/_/_project/_meta b/packages/_/_project/_meta index 3ac7bed..d0787c4 100644 --- a/packages/_/_project/_meta +++ b/packages/_/_project/_meta @@ -27,7 +27,7 @@ Have a look at http://en.opensuse.org/Portal:Factory for more details. - + x86_64 i586 diff --git a/packages/_/_project/_staging_workflow b/packages/_/_project/_staging_workflow index 0c6996b..c018cfc 100644 --- a/packages/_/_project/_staging_workflow +++ b/packages/_/_project/_staging_workflow @@ -19,39 +19,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +