diff --git a/_attribute b/_attribute
index 5150498..01fe62d 100644
--- a/_attribute
+++ b/_attribute
@@ -31,7 +31,7 @@
boo#1162853: '20200312'
boo#1163655: '20200218'
boo#1163766: '20200414'
- boo#1164313: '20210131'
+ boo#1164313: '20210201'
boo#1166657: '20200405'
boo#1167245: '20200327'
boo#1167332: '20200319'
@@ -75,7 +75,7 @@
boo#1174071: '20200714'
boo#1174424: '20200729'
boo#1174499: '20200728'
- boo#1174680: '20210131'
+ boo#1174680: '20210201'
boo#1174797: '20200805'
boo#1174857: '20201215'
boo#1175108: '20200831'
@@ -103,8 +103,8 @@
boo#1176841: '20201021'
boo#1176894: '20200923'
boo#1177402: '20201009'
- boo#1177461: '20210131'
- boo#1177462: '20210131'
+ boo#1177461: '20210201'
+ boo#1177462: '20210201'
boo#117751: '20201114'
boo#1177517: '20210131'
boo#1177779: '20201026'
@@ -207,7 +207,7 @@
poo#66331: '20200710'
poo#66373: '20200502'
poo#66580: '20200627'
- poo#66784: '20210131'
+ poo#66784: '20210201'
poo#66967: '20200802'
poo#67183: '20200622'
poo#67216: '20200526'
@@ -269,11 +269,11 @@
poo#80966: '20210131'
poo#81036: '20201217'
poo#81256: '20210118'
- poo#81382: '20210131'
+ poo#81382: '20210201'
poo#87680: '20210122'
poo#87692: '20210201'
poo#87844: '20210115'
- poo#88073: '20210131'
+ poo#88073: '20210201'
poo#88107: '20210128'
@@ -318,7 +318,7 @@ bad-rpmlint-entries = suse-dbus-unauthorized-service suse-pam-unauthorized-modul
s/openSUSE-/openSUSE-Staging:$LETTER-/
- 20210201
+ 20210202
arch: x86_64
diff --git a/_config b/_config
index 5e03650..296a81a 100644
--- a/_config
+++ b/_config
@@ -10,7 +10,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:20210126
+ExpandFlags: macroserial:20210202
ExpandFlags: kiwi-nobasepackages
@@ -1377,12 +1377,14 @@ Macros:
%skip_python2 1
%_without_python2 1
-# This method for generating python_modules gets too deep to expand at about 5 python flavors.
-# It is replaced by a Lua macro in macros.lua
-# However, OBS has a much higher expansion depth, so this works fine.
-%python_module_iter(a:) %{-a*}-%{args} %{expand:%%{?!python_module_iter_%1:%%{python_module_iter -a%*}}}
-%python_module_iter_STOP stop
-%python_module() %{expand:%%define args %{**}} %{expand:%%{python_module_iter -a %{pythons} STOP}}
+# prjconf definitions for python-rpm-macros
+# This method for generating python_modules gets too deep to expand for rpm at about 5 python flavors.
+# Hence, python_module_iter is replaced by python_module_lua in macros.lua.
+# However, OBS cannot expand lua, but has a much higher expansion depth, so this works fine for the server side resolver.
+%python_module_iter(a:) %{expand:%%define python %{-a*}} ( %python-%args ) %{expand:%%{?!python_module_iter_%1:%%{python_module_iter -a%*}}%%{?python_module_iter_%1}}
+# pseudo-undefine for obs: reset for the next expansion within the next call of python_module
+%python_module_iter_STOP %global python %%%%python
+%python_module() %{?!python_module_lua:%{expand:%%define args %{**}} %{expand:%%{python_module_iter -a %{pythons} STOP}}}%{?python_module_lua:%python_module_lua %{**}}
%add_python() %{expand:%%define pythons %pythons %1}
:Macros
diff --git a/_staging_workflow b/_staging_workflow
index 486ea5b..eee2ba8 100644
--- a/_staging_workflow
+++ b/_staging_workflow
@@ -70,12 +70,10 @@
-
-
@@ -85,7 +83,6 @@
-
@@ -97,65 +94,37 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+