diff --git a/.files b/.files
index 3eebc06..9e88f0f 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 949f3e1..807af4d 100644
--- a/.rev
+++ b/.rev
@@ -14588,4 +14588,32 @@
staging-bot
Automatic update
+
+ cc1142f5ea4c5ca251e1a9b87566bcde
+ unknown
+
+ staging-bot
+ Automatic update
+
+
+ 11612cb85afda0efd59d242e77eafdfa
+ unknown
+
+ staging-bot
+ Automatic update
+
+
+ 0ba5aa4e022511bff32e95b872928f81
+ unknown
+
+ staging-bot
+ Automatic update
+
+
+ f5af1e616c6865fc1131fb63ade8fbd0
+ unknown
+
+ staging-bot
+ Automatic update
+
diff --git a/.servicemark b/.servicemark
index 2d3e27f..346062f 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-3027e0c77e6400b3504d574832ebbbe6
+1d905d29607569a25f8a3991ee43baff
diff --git a/MicroOS-release.spec b/MicroOS-release.spec
index 2ab184f..fa5d36f 100644
--- a/MicroOS-release.spec
+++ b/MicroOS-release.spec
@@ -17,7 +17,7 @@
Name: MicroOS-release
-Version: 20230131
+Version: 20230202
Release: 0
Summary: openSUSE MicroOS
License: GPL-2.0-or-later
@@ -176,9 +176,9 @@ ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 %arm
%include %{SOURCE100}
Provides: %name-%version
Provides: product() = MicroOS
-Provides: product(MicroOS) = 20230131-0
+Provides: product(MicroOS) = 20230202-0
Provides: product-label() = openSUSE%20MicroOS
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20230131
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20230202
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
Provides: product-endoflife()
Requires: product_flavor(MicroOS)
@@ -194,7 +194,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(MicroOS) = 20230131-0
+Provides: product_flavor(MicroOS) = 20230202-0
Summary: openSUSE MicroOS%{?betaversion: %{betaversion}}
%description dvd
@@ -210,7 +210,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-Provides: product_flavor(MicroOS) = 20230131-0
+Provides: product_flavor(MicroOS) = 20230202-0
Summary: openSUSE MicroOS%{?betaversion: %{betaversion}}
%description appliance
@@ -274,11 +274,11 @@ cat >%{buildroot}%{_sysconfdir}/products.d/MicroOS.prod << EOF
openSUSE
MicroOS
- 20230131
+ 20230202
0
%{_target_cpu}
- cpe:/o:opensuse:microos:20230131
+ cpe:/o:opensuse:microos:20230202
MicroOS
diff --git a/openSUSE-Addon-NonOss-release.spec b/openSUSE-Addon-NonOss-release.spec
index 8e436b0..37cfb8c 100644
--- a/openSUSE-Addon-NonOss-release.spec
+++ b/openSUSE-Addon-NonOss-release.spec
@@ -1,5 +1,5 @@
#
-# spec file for package openSUSE-Addon-NonOss-release (Version 20230131)
+# spec file for package openSUSE-Addon-NonOss-release (Version 20230202)
#
# Copyright (c) 2023 openSUSE.
#
@@ -16,7 +16,7 @@
Name: openSUSE-Addon-NonOss-release
%define product openSUSE-Addon-NonOss
Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}}
-Version: 20230131
+Version: 20230202
Release: 0
License: BSD-3-Clause
Group: System/Fhs
@@ -24,9 +24,9 @@ Group: System/Fhs
Provides: %name-%version
Provides: product() = openSUSE%2DAddon%2DNonOss
-Provides: product(openSUSE-Addon-NonOss) = 20230131-0
+Provides: product(openSUSE-Addon-NonOss) = 20230202-0
Provides: product-label() = non%20oss%20addon
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20230131
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20230202
AutoReqProv: on
@@ -49,10 +49,10 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE-Addon-NonOss.prod << EOF
openSUSE
openSUSE-Addon-NonOss
- 20230131
+ 20230202
0
%{_target_cpu}
- cpe:/o:opensuse:opensuse-addon-nonoss:20230131
+ cpe:/o:opensuse:opensuse-addon-nonoss:20230202
diff --git a/openSUSE-release.spec b/openSUSE-release.spec
index 596941a..8bc6dab 100644
--- a/openSUSE-release.spec
+++ b/openSUSE-release.spec
@@ -20,7 +20,7 @@
#define betaversion %{nil}
%define codename Tumbleweed
Name: openSUSE-release
-Version: 20230131
+Version: 20230202
Release: 0
# 0 is the product release, not the build release of this package
Summary: openSUSE Tumbleweed
@@ -29,6 +29,11 @@ Group: System/Fhs
Source100: weakremovers.inc
BuildRequires: skelcd-control-openSUSE
BuildRequires: skelcd-openSUSE
+%ifarch %ix86
+# on ix86 we need sed to rewrite the zypper repo files for the i586 port split
+Requires: %{_bindir}/sed
+Requires: %{_bindir}/grep
+%endif
Suggests: branding-openSUSE
Suggests: distribution-logos-openSUSE-Tumbleweed
Suggests: java-11-openjdk
@@ -180,7 +185,7 @@ Provides: weakremover(openssl-debuginfo)
%include %{SOURCE100}
Provides: %name-%version
Provides: product() = openSUSE
-Provides: product(openSUSE) = 20230131-0
+Provides: product(openSUSE) = 20230202-0
%ifarch x86_64
Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
%endif
@@ -194,7 +199,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Dppc64le
Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64
%endif
Provides: product-label() = openSUSE
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20230131
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20230202
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F
Requires: product_flavor(openSUSE)
@@ -208,7 +213,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(ftp)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description ftp
@@ -223,7 +228,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(mini)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description mini
@@ -238,7 +243,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description dvd
@@ -253,7 +258,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-kde)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-kde
@@ -268,7 +273,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-x11)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-x11
@@ -283,7 +288,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-gnome)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-gnome
@@ -298,7 +303,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-xfce)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description livecd-xfce
@@ -313,7 +318,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-kde)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-kde
@@ -328,7 +333,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-gnome)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-gnome
@@ -343,7 +348,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-x11)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description usb-x11
@@ -358,7 +363,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance
@@ -373,7 +378,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-docker)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-docker
@@ -388,7 +393,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-kvm)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-kvm
@@ -403,7 +408,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-vmware)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-vmware
@@ -418,7 +423,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-openstack)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-openstack
@@ -433,7 +438,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-hyperv)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-hyperv
@@ -448,7 +453,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-vagrant)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-vagrant
@@ -463,7 +468,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-wsl)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-wsl
@@ -478,7 +483,7 @@ License: BSD-3-Clause
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-custom)
-Provides: product_flavor(openSUSE) = 20230131-0
+Provides: product_flavor(openSUSE) = 20230202-0
Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}}
%description appliance-custom
@@ -557,10 +562,10 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE.prod << EOF
openSUSE
openSUSE
- 20230131
+ 20230202
0
%{_target_cpu}
- cpe:/o:opensuse:opensuse:20230131
+ cpe:/o:opensuse:opensuse:20230202
openSUSE
@@ -745,6 +750,14 @@ if [ -x %{_sbindir}/issue-generator ]; then
fi
%{_sbindir}/issue-generator || :
fi
+# on i586, we are migrating from the main TW repo to the external ports repo
+%ifarch %ix86
+
+ if ! %{_bindir}/grep -q "ports/i586" /etc/zypp/repos.d/*; then
+ %{_bindir}/sed -i "s|opensuse.org/tumbleweed/repo|opensuse.org/ports/i586/tumbleweed/repo|gi" /etc/zypp/repos.d/* || :
+ %{_bindir}/sed -i "s|opensuse.org/update/tumbleweed|opensuse.org/ports/i586/update/tumbleweed|gi" /etc/zypp/repos.d/* || :
+ fi
+%endif
%files
%defattr(644,root,root,755)
diff --git a/weakremovers.inc b/weakremovers.inc
index 92fc02b..de0fcc5 100644
--- a/weakremovers.inc
+++ b/weakremovers.inc
@@ -7689,6 +7689,7 @@ Provides: weakremover(libVkLayer_utils-1_3_216_0)
Provides: weakremover(libVkLayer_utils-1_3_224_0)
Provides: weakremover(libVkLayer_utils-1_3_224_1)
Provides: weakremover(libVkLayer_utils-1_3_231_0)
+Provides: weakremover(libVkLayer_utils-1_3_236_0)
Provides: weakremover(libXTrap-devel)
Provides: weakremover(libXTrap6)
Provides: weakremover(libXxf86misc-devel)
@@ -8873,6 +8874,7 @@ Provides: weakremover(libconfig8)
Provides: weakremover(libconfig9)
Provides: weakremover(libconfuse0)
Provides: weakremover(libconfuse0-lang)
+Provides: weakremover(libcotp12)
Provides: weakremover(libcourier-unicode3)
Provides: weakremover(libcourier-unicode4)
Provides: weakremover(libcppdb0)