diff --git a/_attribute b/_attribute
index 9f57014..62a4ecd 100644
--- a/_attribute
+++ b/_attribute
@@ -4,68 +4,23 @@
last_seen:
- boo#1172073: '20220516'
- boo#1176553: '20220311'
- boo#1183454: '20220605'
- boo#1189869: '20211207'
- boo#1190434: '20220605'
- boo#1190670: '20211128'
+ boo#1094987: '20220725'
+ boo#1172073: '20220614'
+ boo#1183454: '20220725'
+ boo#1190434: '20220725'
boo#1190823: '20220409'
- boo#1191225: '20211210'
- boo#1191603: '20220306'
- boo#1192118: '20211117'
- boo#1192420: '20211106'
- boo#1192667: '20211128'
- boo#1192701: '20211123'
- boo#1192812: '20220301'
- boo#1192921: '20211122'
- boo#1192940: '20211121'
- boo#1192959: '20211121'
- boo#1193016: '20211127'
- boo#1193038: '20211124'
- boo#1193133: '20220224'
- boo#1193134: '20220101'
- boo#1193344: '20211202'
- boo#1193345: '20211211'
- boo#1193502: '20211207'
- boo#1193547: '20211208'
- boo#1193695: '20211214'
- boo#1193758: '20211214'
- boo#1193909: '20220202'
- boo#1194054: '20220103'
- boo#1194208: '20220111'
- boo#1194544: '20220120'
- boo#1194699: '20220113'
- boo#1194722: '20220124'
- boo#1195151: '20220205'
- boo#1195174: '20220126'
- boo#1195295: '20220213'
- boo#1195318: '20220214'
- boo#1195319: '20220202'
- boo#1195555: '20220317'
- boo#1195637: '20220213'
- boo#1195945: '20220222'
- boo#1195952: '20220314'
- boo#1196116: '20220216'
boo#1196201: '20220525'
boo#1196335: '20220524'
- boo#1196404: '20220301'
- boo#1196492: '20220224'
boo#1196609: '20220516'
- boo#1196758: '20220306'
- boo#1196799: '20220313'
- boo#1196801: '20220312'
- boo#1196857: '20220321'
boo#1196862: '20220501'
boo#1196922: '20220510'
boo#1196978: '20220509'
boo#1197120: '20220521'
- boo#1197134: '20220327'
boo#1197192: '20220407'
boo#1197521: '20220403'
boo#1197638: '20220404'
boo#1197704: '20220517'
- boo#1197719: '20220605'
+ boo#1197719: '20220725'
boo#1197931: '20220412'
boo#1198150: '20220421'
boo#1198169: '20220413'
@@ -74,101 +29,72 @@
boo#1198418: '20220518'
boo#1199498: '20220512'
boo#1199535: '20220516'
- boo#1199881: '20220605'
- boo#1199885: '20220605'
+ boo#1199881: '20220725'
+ boo#1199885: '20220606'
boo#1199924: '20220601'
boo#1199925: '20220601'
- bsc#1161276: '20220605'
- bsc#1191684: '20220605'
- bsc#1194208: '20220216'
- bsc#1196925: '20220314'
- bsc#1198101: '20220605'
+ boo#1200275: '20220725'
+ boo#1200403: '20220725'
+ boo#1200595: '20220614'
+ boo#1200600: '20220614'
+ boo#1200615: '20220627'
+ boo#1200616: '20220725'
+ boo#1200682: '20220628'
+ boo#1200753: '20220725'
+ boo#1200893: '20220718'
+ boo#1200894: '20220725'
+ boo#1201054: '20220711'
+ boo#1201057: '20220721'
+ boo#1201082: '20220711'
+ boo#1201348: '20220714'
+ boo#1201349: '20220719'
+ boo#1201504: '20220719'
+ boo#1201538: '20220722'
+ bsc#1161276: '20220725'
+ bsc#1191684: '20220721'
+ bsc#1198101: '20220725'
bsc#1198235: '20220503'
- gh#os-autoinst/os-autoinst-distri-opensuse#13666: '20211129'
- gh#os-autoinst/os-autoinst-distri-opensuse#14599: '20220328'
- kde#449273: '20220223'
- poo#100991: '20211117'
- poo#101109: '20211102'
- poo#101608: '20211128'
- poo#101620: '20211220'
- poo#101752: '20211113'
- poo#101984: '20211107'
- poo#101990: '20211127'
- poo#102188: '20211212'
- poo#102278: '20211124'
- poo#102557: '20211119'
- poo#102726: '20211128'
- poo#102795: '20211129'
- poo#103143: '20211205'
- poo#103431: '20211201'
- poo#103470: '20211207'
- poo#103533: '20220306'
- poo#103867: '20211219'
- poo#104163: '20220108'
- poo#104325: '20211227'
- poo#104505: '20211229'
- poo#104541: '20220207'
- poo#104542: '20220103'
- poo#104559: '20220102'
- poo#104794: '20220120'
- poo#104851: '20220111'
- poo#104854: '20220111'
- poo#104859: '20220111'
- poo#104926: '20220206'
- poo#105256: '20220226'
- poo#105271: '20220330'
- poo#105286: '20220123'
- poo#105289: '20220125'
- poo#105292: '20220126'
+ gh#os-autoinst/os-autoinst-distri-opensuse#15257: '20220719'
poo#105295: '20220518'
- poo#105298: '20220126'
- poo#105443: '20220124'
- poo#105762: '20220130'
- poo#105768: '20220131'
- poo#105981: '20220204'
poo#106676: '20220412'
- poo#106963: '20220216'
- poo#107068: '20220226'
- poo#107092: '20220222'
- poo#107107: '20220303'
- poo#107110: '20220228'
- poo#107113: '20220224'
- poo#107248: '20220331'
- poo#107728: '20220314'
poo#107893: '20220419'
poo#108770: '20220518'
poo#108887: '20220420'
- poo#108902: '20220604'
- poo#108905: '20220329'
+ poo#108902: '20220628'
poo#109422: '20220421'
poo#109611: '20220602'
poo#109731: '20220414'
- poo#109983: '20220605'
+ poo#109983: '20220620'
poo#110049: '20220420'
poo#110211: '20220531'
- poo#110473: '20220605'
- poo#110581: '20220603'
+ poo#110473: '20220721'
+ poo#110581: '20220629'
poo#110740: '20220517'
poo#110872: '20220517'
- poo#111036: '20220605'
+ poo#111036: '20220612'
poo#111069: '20220530'
- poo#111266: '20220605'
+ poo#111266: '20220725'
poo#111416: '20220525'
- poo#111479: '20220605'
+ poo#111479: '20220622'
poo#111485: '20220523'
- poo#111551: '20220601'
+ poo#111551: '20220707'
poo#111596: '20220525'
- poo#111599: '20220605'
+ poo#111599: '20220626'
poo#111971: '20220601'
+ poo#112241: '20220608'
+ poo#112244: '20220608'
+ poo#112580: '20220625'
+ poo#112649: '20220722'
+ poo#112700: '20220622'
+ poo#112982: '20220623'
+ poo#113051: '20220703'
+ poo#113075: '20220725'
+ poo#113114: '20220628'
+ poo#113360: '20220712'
+ poo#113492: '20220725'
+ poo#113549: '20220713'
poo#63397: '20220422'
- poo#80628: '20220323'
- poo#91383: '20220111'
- poo#96611: '20211109'
- poo#99039: '20211110'
- poo#99057: '20220115'
poo#99312: '20220502'
- poo#99582: '20211101'
- poo#99651: '20211113'
@@ -178,7 +104,8 @@ splitter-whitelist =
# now just for testing
source_projects_expand = devel:languages:haskell
-devel-whitelist =
+# devel:BCI:Tumbleweed for inclusion of BCI containers - rbrown 10 Jun 2022
+devel-whitelist = devel:BCI:Tumbleweed
# packagelist generator related configuration
pkglistgen-archs = i586 x86_64
@@ -203,14 +130,14 @@ installcheck-ignore-conflicts = lua53-devel lua51-devel gcc-go lua53 lua51 busyb
allowed-missing-32bit-binaries-importing = audit-secondary bash coreutils curl-mini dbus-1-x11 ft2demos gamin gdb gettext-runtime-mini krb5-mini librtas librtas-doc libselinux-bindings LibVNCServer llvm lvm2 lvm2-clvm openssl openucx postgresql10 postgresql96 psl-make-dafsa python-libxml2-python python-magic python-rpm python-semanage strace syslinux systemd-mini util-linux-systemd
# packages in here are rebuild if their buildinfo changed
-rebuildpacs-leafs = branding-openSUSE PackageKit-branding-openSUSE xfce4-branding-openSUSE xfce4-branding-openSUSE installation-images:openSUSE installation-images:Kubic installation-images:MicroOS rpmlint rpmlint-mini perf bpftool wsl-appx yast2-schema-default yast2-schema-micro
+rebuildpacs-leafs = branding-openSUSE PackageKit-branding-openSUSE xfce4-branding-openSUSE xfce4-branding-openSUSE installation-images:openSUSE installation-images:MicroOS rpmlint rpmlint-mini perf bpftool wsl-appx yast2-schema-default yast2-schema-micro
s/openSUSE-/openSUSE-Staging:$LETTER-/
- 20220606
+ 20220726
arch: x86_64
@@ -359,6 +286,15 @@ products:
- tumbleweed-busybox-image:
- i586
- x86_64
+ - busybox-image:
+ - i586
+ - x86_64
+ - micro-image:
+ - i586
+ - x86_64
+ - minimal-image:
+ - i586
+ - x86_64
containerfile:
- cdi-apiserver-container:
- x86_64
@@ -401,6 +337,9 @@ products:
- tomcat-image:
- i586
- x86_64
+ - init-image:
+ - i586
+ - x86_64
- virt-api-container:
- x86_64
- virt-handler-container:
@@ -416,6 +355,10 @@ products:
- virt-vmdp-container:
- i586
- x86_64
+ - virt-exportproxy-container:
+ - x86_64
+ - virt-exportserver-container:
+ - x86_64
ftp:
- 000product:openSUSE-ftp-ftp-i586_x86_64
- 000product:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64
@@ -517,9 +460,9 @@ set_snapshot_number: True
failed: ''
-published: '20220605'
-publishing: '20220605'
-testing: '20220605'
+published: '20220725'
+publishing: '20220725'
+testing: '20220726'
diff --git a/_config b/_config
index edd64f0..b056534 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:20220510
+ExpandFlags: macroserial:20220614
ExpandFlags: kiwi-nobasepackages
ExpandFlags: docker-nobasepackages
@@ -196,6 +196,8 @@ FileProvides: /usr/bin/killall psmisc
FileProvides: /usr/bin/mkdir coreutils busybox-coreutils
FileProvides: /usr/bin/mimencode metamail
FileProvides: /usr/bin/mkisofs mkisofs
+# https://bugzilla.suse.com/show_bug.cgi?id=1199995
+FileProvides: /usr/bin/node nodejs-default
FileProvides: /usr/bin/openssl openssl
FileProvides: /usr/bin/perl perl-base
FileProvides: /usr/bin/pkg-config pkgconf-pkg-config
@@ -203,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
@@ -486,7 +488,7 @@ Prefer: go -go1.13
Prefer: kernel-default-base
# have choice for kubernetes-kubelet-common (de-prefer the old versions, ensuring to have a new unresolvable when a new version shows up)
-Prefer: -kubernetes1.18-kubelet-common -kubernetes1.19-kubelet-common -kubernetes1.20-kubelet-common -kubernetes1.21-kubelet-common -kubernetes1.22-kubelet-common
+Prefer: -kubernetes1.18-kubelet-common -kubernetes1.19-kubelet-common -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
@@ -511,9 +513,12 @@ Prefer: libftdi-devel
Prefer: tensorflow2
# have choice for python3-sip: python3-sip-devel python3-sip4
-Prefer: python38-sip-devel python39-sip-devel
+Prefer: python38-sip-devel python39-sip-devel python310-sip-devel
Prefer: -python38-sip4 -python38-sip4-devel
Prefer: -python39-sip4 -python39-sip4-devel
+Prefer: -python310-sip4 -python310-sip4-devel
+
+Prefer: python310-Shapely:geos
# pipewire has a jack compatible implementation - but for now we prefer the real jack
Prefer: -pipewire-libjack-0_3-devel libjack0
@@ -1059,6 +1064,8 @@ Prefer: libglfw3
# have choice for (xclip or wl-clipboard) needed by password-store: wl-clipboard xclip
Prefer: -wl-clipboard
Prefer: -firewalld-prometheus-config
+# Replaced by google-noto-coloremoji-fonts. DR pending as sr#990015.
+Prefer: -noto-coloremoji-fonts
Ignore: installation-images-openSUSE:cracklib-dict-full
Ignore: openSUSE-release:openSUSE-release-ftp,openSUSE-release-dvd5,openSUSE-release-biarch,openSUSE-release-livecdkde,openSUSE-release-livecdgnome
@@ -1335,7 +1342,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
@@ -1348,6 +1355,8 @@ Macros:
# 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 %{**}}
+# gh#openSUSE/python-rpm-macros#127 ... define our current primary Python interpreter
+%primary_python python310
## PYTHON MACROS END
:Macros
diff --git a/_staging_workflow b/_staging_workflow
index dad21d1..1cd4377 100644
--- a/_staging_workflow
+++ b/_staging_workflow
@@ -15,20 +15,45 @@
+
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+