From eedecedb471683aa41aed52a4dacdad7ec6ca2aa Mon Sep 17 00:00:00 2001 From: Lubos Kocman Date: Wed, 12 Oct 2022 10:17:33 +0000 Subject: [PATCH] Accepting request 1010184 from home:lkocman:branches:Base:System - Update to version 20221012.c4167e1: * Initial MicroOS flavor based on TW OBS-URL: https://build.opensuse.org/request/show/1010184 OBS-URL: https://build.opensuse.org/package/show/Base:System/openSUSE-repos?expand=0&rev=7 --- _servicedata | 2 +- openSUSE-repos-20221012.c4167e1.obscpio | 3 +++ openSUSE-repos-20221012.c4167e1.tar.xz | 3 +++ openSUSE-repos.changes | 9 +++++++ openSUSE-repos.obsinfo | 6 ++--- openSUSE-repos.spec | 31 ++++++++++++++++++++++++- 6 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 openSUSE-repos-20221012.c4167e1.obscpio create mode 100644 openSUSE-repos-20221012.c4167e1.tar.xz diff --git a/_servicedata b/_servicedata index cb98b8d..688a716 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/openSUSE-repos.git - 9321e0695f80a68d9f402b111eaeea932960bdec \ No newline at end of file + 3b26596b2bfee25b27dfee074cc7c13d3f9934a5 \ No newline at end of file diff --git a/openSUSE-repos-20221012.c4167e1.obscpio b/openSUSE-repos-20221012.c4167e1.obscpio new file mode 100644 index 0000000..c5ddba9 --- /dev/null +++ b/openSUSE-repos-20221012.c4167e1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:275928949b8b68aa76455a1929bad36be7cdfc49b89211625a0618295f273e89 +size 18442 diff --git a/openSUSE-repos-20221012.c4167e1.tar.xz b/openSUSE-repos-20221012.c4167e1.tar.xz new file mode 100644 index 0000000..988b609 --- /dev/null +++ b/openSUSE-repos-20221012.c4167e1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5f293e723786cf6e238eaff25cb78b319cf1c45edab3c6be3efb0b8bdc9f2dd +size 3336 diff --git a/openSUSE-repos.changes b/openSUSE-repos.changes index bf3b84d..d79bd73 100644 --- a/openSUSE-repos.changes +++ b/openSUSE-repos.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Oct 12 10:00:06 UTC 2022 - opensuse-releaseteam@opensuse.org + +- Update to version 20221012.c4167e1: + * fix broken spec + * Remove unwanted second spec + * Rebase MicroOS on top of single-spec setup + * Initial MicroOS flavor based on TW + ------------------------------------------------------------------- Fri Oct 07 20:37:54 UTC 2022 - opensuse-releaseteam@opensuse.org diff --git a/openSUSE-repos.obsinfo b/openSUSE-repos.obsinfo index e65381f..452c13a 100644 --- a/openSUSE-repos.obsinfo +++ b/openSUSE-repos.obsinfo @@ -1,4 +1,4 @@ name: openSUSE-repos -version: 20221007.638a03b -mtime: 1665159955 -commit: 638a03bfcab128a6153a74716ed2dfd841e8b3d8 +version: 20221012.c4167e1 +mtime: 1665568209 +commit: c4167e1ff9b1fd464f8fa35aed9c11a028e0f2e6 diff --git a/openSUSE-repos.spec b/openSUSE-repos.spec index f039e19..5caba99 100644 --- a/openSUSE-repos.spec +++ b/openSUSE-repos.spec @@ -33,6 +33,10 @@ ExclusiveArch: do_not_build %define branding tumbleweed %endif %endif +%if "%flavor" == "openSUSE-repos-MicroOS" +%define theme MicroOS +%define branding microos +%endif %if 0%{?sle_version} # Leap %if 0%{?is_leapmicro} @@ -58,7 +62,7 @@ Name: openSUSE-repos %else Name: openSUSE-repos-%{theme} %endif -Version: 20221007.638a03b +Version: 20221012.c4167e1 Release: 0 Summary: openSUSE package repositories License: MIT @@ -78,6 +82,13 @@ Obsoletes: openSUSE-repos-Leap Obsoletes: openSUSE-repos-LeapMicro %endif +%if "%{?theme}" == "MicroOS" +# Support migration from literally anything including TW to MicroOS +Obsoletes: openSUSE-repos-Leap +Obsoletes: openSUSE-repos-LeapMicro +Obsoletes: openSUSE-repos-Tumbleweed +%endif + %description Definitions for openSUSE repository management via zypp-services @@ -98,6 +109,12 @@ Definitions for openSUSE repository management via zypp-services %endif %endif +%if "%{theme}" == "MicroOS" +%ifarch x86_64 aarch64 +%{_datadir}/zypp/local/service/openSUSE/repo/opensuse-%{branding}-repoindex.xml +%endif +%endif + %if "%{theme}" == "LeapMicro" %ifarch x86_64 aarch64 %{_datadir}/zypp/local/service/openSUSE/repo/opensuse-%{branding}-repoindex.xml @@ -132,6 +149,12 @@ install opensuse-%{branding}-ports-repoindex.xml -pm 0644 %{buildroot}%{_datadir %endif %endif +%if "%{theme}" == "MicroOS" +%ifarch x86_64 aarch64 +install opensuse-%{branding}-repoindex.xml -pm 0644 %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo +%endif +%endif + %if "%{theme}" == "LeapMicro" %ifarch x86_64 aarch64 install opensuse-%{branding}-repoindex.xml -pm 0644 %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo @@ -187,6 +210,12 @@ ln -sf opensuse-%{branding}-ports-repoindex.xml %{_datadir}/zypp/local/service/o %endif %endif +%if "%{theme}" == "MicroOS" +%ifarch x86_64 aarch64 +ln -sf opensuse-%{branding}-repoindex.xml %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml +%endif +%endif + %if "%{theme}" == "LeapMicro" %ifarch x86_64 aarch64 ln -sf opensuse-%{branding}-repoindex.xml %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml