diff --git a/_servicedata b/_servicedata
index 34e611b..b8439c4 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/openSUSE/openSUSE-repos.git
- da3133a74ddd660b1daef2d166495bd547c86737
\ No newline at end of file
+ 8eeed203cb8dab0bc67d33d3537a2cd11261a10e
\ No newline at end of file
diff --git a/openSUSE-repos-20220926.da3133a.obscpio b/openSUSE-repos-20220926.da3133a.obscpio
deleted file mode 100644
index b4c80da..0000000
--- a/openSUSE-repos-20220926.da3133a.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be4248008d943209104f7750d03123c04fe3ace61d54ff259d87463340b3ebfd
-size 22026
diff --git a/openSUSE-repos-20220926.da3133a.tar.xz b/openSUSE-repos-20220926.da3133a.tar.xz
deleted file mode 100644
index de9e24c..0000000
--- a/openSUSE-repos-20220926.da3133a.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:669e159ac5748c135de68a3171e68ae494f3fa39fda6f38ba797a9f6bb19972d
-size 3136
diff --git a/openSUSE-repos-20221007.0e44106.obscpio b/openSUSE-repos-20221007.0e44106.obscpio
new file mode 100644
index 0000000..8662f08
--- /dev/null
+++ b/openSUSE-repos-20221007.0e44106.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09ae94d6a21648300e4f7ba875511e1a962034627817b8fecbe0327b162d0e82
+size 16394
diff --git a/openSUSE-repos-20221007.0e44106.tar.xz b/openSUSE-repos-20221007.0e44106.tar.xz
new file mode 100644
index 0000000..78baf88
--- /dev/null
+++ b/openSUSE-repos-20221007.0e44106.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba1789330a18e197161afc76bf23654f7dbcc9c52f1b85bd23465c2643f46f95
+size 3228
diff --git a/openSUSE-repos-Leap.spec b/openSUSE-repos-Leap.spec
deleted file mode 100644
index 31e9bb9..0000000
--- a/openSUSE-repos-Leap.spec
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# spec file for package openSUSE-repos-Leap
-#
-# Copyright (c) 2022 SUSE LLC
-# Copyright (c) 2022 Neal Gompa
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
-#
-
-
-%global debug_package %{nil}
-Name: openSUSE-repos-Leap
-Version: 20220926.da3133a
-Release: 0
-Summary: openSUSE package repositories
-License: MIT
-Group: System/Management
-URL: https://github.com/openSUSE/openSUSE-repos
-Source: openSUSE-repos-%{version}.tar.xz
-#boo#1203715
-BuildRequires: -post-build-checks
-# We're compatible with any SUSE Linux distribution
-Requires: suse-release
-Requires: zypper
-Conflicts: otherproviders(openSUSE-repos)
-Provides: openSUSE-repos
-
-%description
-Definitions for openSUSE repository management via zypp-services
-
-%files
-
-%dir %{_datadir}/zypp/local/
-%dir %{_datadir}/zypp/local/service
-%dir %{_datadir}/zypp/local/service/openSUSE
-%dir %{_datadir}/zypp/local/service/openSUSE/repo
-%ghost %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml
-%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-
-%ifarch ix86 x86_64 aarch64 power64 s390x
-%{_datadir}/zypp/local/service/openSUSE/repo/opensuse-leap-repoindex.xml
-%else
-%{_datadir}/zypp/local/service/openSUSE/repo/opensuse-leap-ports-repoindex.xml
-%endif
-
-%prep
-%setup -q -n openSUSE-repos-%{version}
-
-
-%build
-# Nothing to build
-
-
-%install
-
-mkdir -p %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo
-mkdir -p %{buildroot}%{_sysconfdir}/zypp/vars.d/
-
-# Setup for primary arches
-%ifarch ix86 x86_64 aarch64 power64 s390x
-install opensuse-leap-repoindex.xml -pm 0644 %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo
-
-# Setup for ports
-%else
-install opensuse-leap-ports-repoindex.xml -pm 0644 %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo
-%endif
-
-%ifarch %{ix86}
-echo "x86" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-%ifarch x86_64
-echo "x86_64" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-%ifarch aarch64
-echo "aarch64" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-%ifarch armv6l armv6hl
-echo "armv6hl" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-%ifarch armv7l armv7hl
-echo "armv7hl" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-%ifarch ppc ppc64 ppc64le
-echo "ppc" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-%ifarch riscv64
-echo "riscv" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-%ifarch s390x
-echo "zsystems" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-
-%post
-%ifarch ix86 x86_64 aarch64 power64 s390x
-ln -sf opensuse-leap-repoindex.xml %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml
-%else
-ln -sf opensuse-leap-ports-repoindex.xml %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml
-%endif
-
-# We hereby declare that running this will not influence existing transaction
-ZYPP_READONLY_HACK=1 zypper addservice %{_datadir}/zypp/local/service/openSUSE openSUSE
-
-%postun
-if [ "$1" = 0 ] ; then
- # We hereby declare that running this will not influence existing transaction
- ZYPP_READONLY_HACK=1 zypper removeservice openSUSE
- if [ -L "%{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml" ] ; then
- rm -f %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml
- fi
-fi
-
-%changelog
diff --git a/openSUSE-repos-LeapMicro.spec b/openSUSE-repos-LeapMicro.spec
deleted file mode 100644
index baf0061..0000000
--- a/openSUSE-repos-LeapMicro.spec
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# spec file for package openSUSE-repos-LeapMicro
-#
-# Copyright (c) 2022 SUSE LLC
-# Copyright (c) 2022 Neal Gompa
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
-#
-
-
-%global debug_package %{nil}
-Name: openSUSE-repos-LeapMicro
-Version: 20220926.da3133a
-Release: 0
-Summary: openSUSE package repositories
-License: MIT
-Group: System/Management
-URL: https://github.com/openSUSE/openSUSE-repos
-Source: openSUSE-repos-%{version}.tar.xz
-#boo#1203715
-BuildRequires: -post-build-checks
-# We're compatible with any SUSE Linux distribution
-Requires: suse-release
-Requires: zypper
-Conflicts: otherproviders(openSUSE-repos)
-Provides: openSUSE-repos
-
-%description
-Definitions for openSUSE repository management via zypp-services
-
-%files
-
-%dir %{_datadir}/zypp/local/
-%dir %{_datadir}/zypp/local/service
-%dir %{_datadir}/zypp/local/service/openSUSE
-%dir %{_datadir}/zypp/local/service/openSUSE/repo
-%ghost %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml
-%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-
-%{_datadir}/zypp/local/service/openSUSE/repo/opensuse-leap-micro-repoindex.xml
-
-%prep
-%setup -q -n openSUSE-repos-%{version}
-
-
-%build
-# Nothing to build
-
-
-%install
-
-mkdir -p %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo
-mkdir -p %{buildroot}%{_sysconfdir}/zypp/vars.d/
-
-# Setup for primary arches
-install opensuse-leap-micro-repoindex.xml -pm 0644 %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo
-
-%ifarch %{ix86}
-echo "x86" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-%ifarch x86_64
-echo "x86_64" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-%ifarch aarch64
-echo "aarch64" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-%ifarch armv6l armv6hl
-echo "armv6hl" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-%ifarch armv7l armv7hl
-echo "armv7hl" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-%ifarch ppc ppc64 ppc64le
-echo "ppc" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-%ifarch riscv64
-echo "riscv" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-%ifarch s390x
-echo "zsystems" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
-%endif
-
-
-%post
-ln -sf opensuse-leap-micro-repoindex.xml %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml
-
-# We hereby declare that running this will not influence existing transaction
-ZYPP_READONLY_HACK=1 zypper addservice %{_datadir}/zypp/local/service/openSUSE openSUSE
-
-%postun
-if [ "$1" = 0 ] ; then
- # We hereby declare that running this will not influence existing transaction
- ZYPP_READONLY_HACK=1 zypper removeservice openSUSE
- if [ -L "%{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml" ] ; then
- rm -f %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml
- fi
-fi
-
-%changelog
diff --git a/openSUSE-repos.changes b/openSUSE-repos.changes
index e20b0fd..db1e530 100644
--- a/openSUSE-repos.changes
+++ b/openSUSE-repos.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct 07 10:45:42 UTC 2022 - opensuse-releaseteam@opensuse.org
+
+- Update to version 20221007.0e44106:
+ * Packaging: made it to be real multibuild
+
-------------------------------------------------------------------
Mon Sep 26 10:27:53 UTC 2022 - opensuse-releaseteam@opensuse.org
diff --git a/openSUSE-repos.obsinfo b/openSUSE-repos.obsinfo
index 5122f0b..4115fb1 100644
--- a/openSUSE-repos.obsinfo
+++ b/openSUSE-repos.obsinfo
@@ -1,4 +1,4 @@
name: openSUSE-repos
-version: 20220926.da3133a
-mtime: 1664188032
-commit: da3133a74ddd660b1daef2d166495bd547c86737
+version: 20221007.0e44106
+mtime: 1665139124
+commit: 0e441069602af92832b0fa8dcba70962f373aa35
diff --git a/openSUSE-repos-Tumbleweed.spec b/openSUSE-repos.spec
similarity index 53%
rename from openSUSE-repos-Tumbleweed.spec
rename to openSUSE-repos.spec
index 1f5a616..8fdfa93 100644
--- a/openSUSE-repos-Tumbleweed.spec
+++ b/openSUSE-repos.spec
@@ -1,5 +1,5 @@
#
-# spec file for package openSUSE-repos-Tumbleweed
+# spec file
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2022 Neal Gompa
@@ -18,8 +18,43 @@
%global debug_package %{nil}
-Name: openSUSE-repos-Tumbleweed
-Version: 20220926.da3133a
+
+%if "@BUILD_FLAVOR@" == ""
+ExclusiveArch: do_not_build
+%endif
+
+%global flavor @BUILD_FLAVOR@%nil
+
+%if 0%{?is_opensuse}
+# Tumbleweed
+%if "%flavor" == "openSUSE-repos-Tumbleweed"
+%if %suse_version >= 1550
+%define theme Tumbleweed
+%define branding tumbleweed
+%endif
+%endif
+%if 0%{?sle_version}
+# Leap
+%if 0%{?is_leapmicro}
+%if "%flavor" == "openSUSE-repos-LeapMicro"
+%define theme LeapMicro
+%define branding leap-micro
+%endif
+%else
+%if "%flavor" == "openSUSE-repos-Leap"
+%define theme Leap
+%define branding leap
+%endif
+%endif
+%endif
+%endif
+
+%if "%{?theme}" == ""
+ExclusiveArch: do_not_build
+%endif
+
+Name: openSUSE-repos-%{theme}
+Version: 20221007.0e44106
Release: 0
Summary: openSUSE package repositories
License: MIT
@@ -33,9 +68,11 @@ Requires: suse-release
Requires: zypper
Conflicts: otherproviders(openSUSE-repos)
Provides: openSUSE-repos
+%if "%{?theme}" == "Tumbleweed"
# Unconditionally ensure Leap upgrades to Tumbleweed
-Obsoletes: %{name}-Leap
-Obsoletes: %{name}-LeapMicro
+Obsoletes: openSUSE-repos-Leap
+Obsoletes: openSUSE-repos-LeapMicro
+%endif
%description
Definitions for openSUSE repository management via zypp-services
@@ -49,32 +86,60 @@ Definitions for openSUSE repository management via zypp-services
%ghost %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml
%{_sysconfdir}/zypp/vars.d/DIST_ARCH
+%if "%{theme}" == "Tumbleweed"
%ifarch %{ix86} x86_64
-%{_datadir}/zypp/local/service/openSUSE/repo/opensuse-tumbleweed-repoindex.xml
+%{_datadir}/zypp/local/service/openSUSE/repo/opensuse-%{branding}-repoindex.xml
%else
-%{_datadir}/zypp/local/service/openSUSE/repo/opensuse-tumbleweed-ports-repoindex.xml
+%{_datadir}/zypp/local/service/openSUSE/repo/opensuse-%{branding}-ports-repoindex.xml
+%endif
+%endif
+
+%if "%{theme}" == "LeapMicro"
+%ifarch x86_64 aarch64
+%{_datadir}/zypp/local/service/openSUSE/repo/opensuse-%{branding}-repoindex.xml
+%endif
+%endif
+
+%if "%{theme}" == "Leap"
+%ifarch %{ix86} x86_64 aarch64 ppc64le s390x
+%{_datadir}/zypp/local/service/openSUSE/repo/opensuse-%{branding}-repoindex.xml
+%else
+%{_datadir}/zypp/local/service/openSUSE/repo/opensuse-%{branding}-ports-repoindex.xml
+%endif
%endif
%prep
%setup -q -n openSUSE-repos-%{version}
-
%build
# Nothing to build
-
%install
mkdir -p %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo
mkdir -p %{buildroot}%{_sysconfdir}/zypp/vars.d/
# Setup for primary arches
+%if "%{theme}" == "Tumbleweed"
%ifarch %{ix86} x86_64
-install opensuse-tumbleweed-repoindex.xml -pm 0644 %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo
-
-# Setup for ports
+install opensuse-%{branding}-repoindex.xml -pm 0644 %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo
%else ifarch aarch64 %{arm} %{power64} ppc s390x riscv64
-install opensuse-tumbleweed-ports-repoindex.xml -pm 0644 %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo
+install opensuse-%{branding}-ports-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
+%endif
+%endif
+
+%if "%{theme}" == "Leap"
+%ifarch %{ix86} x86_64 aarch64 ppc64le s390x
+install opensuse-%{branding}-repoindex.xml -pm 0644 %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo
+%else
+install opensuse-%{branding}-ports-repoindex.xml -pm 0644 %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo
+%endif
%endif
%ifarch %{ix86}
@@ -109,12 +174,27 @@ echo "riscv" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
echo "zsystems" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
%endif
-
%post
+%if "%{theme}" == "Tumbleweed"
%ifarch %{ix86} x86_64
-ln -sf opensuse-tumbleweed-repoindex.xml %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml
+ln -sf opensuse-%{branding}-repoindex.xml %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml
%else
-ln -sf opensuse-tumbleweed-ports-repoindex.xml %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml
+ln -sf opensuse-%{branding}-ports-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
+%endif
+%endif
+
+%if "%{theme}" == "Leap"
+%ifarch %{ix86} x86_64 aarch64 ppc64le s390x
+ln -sf opensuse-%{branding}-repoindex.xml %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml
+%else
+ln -sf opensuse-%{branding}-ports-repoindex.xml %{_datadir}/zypp/local/service/openSUSE/repo/repoindex.xml
+%endif
%endif
# We hereby declare that running this will not influence existing transaction