diff --git a/.files b/.files index 84898ba..79a8cda 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index a9ca573..2bd6ff5 100644 --- a/.rev +++ b/.rev @@ -1621,4 +1621,23 @@ Main motivation is to have the license files in MicroOS also in /usr/, not in /e https://bugzilla.opensuse.org/show_bug.cgi?id=1202372 1069589 + + 10af31b2eed2111a889ea1167ca42f42 + unknown + + dimstar_suse + + + 2a9415b7002cc5d42461dbff77dffcf5 + unknown + + dimstar_suse + Drop repo migration code + + + f5ca0decc258f1bf2a84aa1bd18a4ebc + unknown + + dimstar_suse + diff --git a/openSUSE-release.spec.in b/openSUSE-release.spec.in index 7a216da..8939f09 100644 --- a/openSUSE-release.spec.in +++ b/openSUSE-release.spec.in @@ -29,11 +29,6 @@ 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 @@ -263,14 +258,6 @@ 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/openSUSE.product.in b/openSUSE.product.in index 7c8a905..ae1d45a 100644 --- a/openSUSE.product.in +++ b/openSUSE.product.in @@ -90,11 +90,9 @@ use_required="true" use_recommended="true" use_suggested="false" use_undecided="true"> - - - + @@ -119,9 +117,6 @@ - - - @@ -133,16 +128,12 @@ run_media_check="true" use_required="true" use_recommended="true" use_suggested="false"> - + - - - -