From 83f7ff7268271ed14a8ba7457385c9c196bad0e4 Mon Sep 17 00:00:00 2001 From: dimstar <> Date: Feb 01 2023 23:27:58 +0000 Subject: Update 000package-groups to rev 224 via SR 1062275 https://build.opensuse.org/request/show/1062275 by user dimstar + dimstar_suse --- diff --git a/.files b/.files index c8d0434..9d7a6b7 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 7f6ce21..4ce3964 100644 --- a/.rev +++ b/.rev @@ -1598,4 +1598,12 @@ Main motivation is to have the license files in MicroOS also in /usr/, not in /e dimstar_suse Ensure amarok is on the DVD - needed for staging + + f0dcd1c8f134451e8557685824813292 + unknown + + dimstar_suse + + 1062275 + diff --git a/.servicemark b/.servicemark deleted file mode 100644 index ee6711c..0000000 --- a/.servicemark +++ /dev/null @@ -1 +0,0 @@ -8550ffec5161a81b79afbefa4fada5d8 diff --git a/openSUSE-release.spec.in b/openSUSE-release.spec.in index 8939f09..7a216da 100644 --- a/openSUSE-release.spec.in +++ b/openSUSE-release.spec.in @@ -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 @@ -258,6 +263,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)