Accepting request 1183211 from home:lkocman:branches:Base:System

- Update to version 20240625.f75b6e5:
  * initial leap 16 repoindex
  * Update README.md
- Handle Leap 16 similar to LEAPM 5 vs 6

OBS-URL: https://build.opensuse.org/request/show/1183211
OBS-URL: https://build.opensuse.org/package/show/Base:System/openSUSE-repos?expand=0&rev=49
This commit is contained in:
2024-06-26 09:31:45 +00:00
committed by Git OBS Bridge
parent 064e6f76c1
commit c0577653c9
6 changed files with 30 additions and 29 deletions

View File

@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/openSUSE-repos.git</param>
<param name="changesrevision">6fd1ef2a02653cd396ab47393b49e9315201af32</param></service><service name="tar_scm">
<param name="changesrevision">f75b6e52e07f4ceee637a611d0f98796383b2fe9</param></service><service name="tar_scm">
<param name="url">https://github.com/lkocman/openSUSE-repos.git</param>
<param name="changesrevision">16902ba1ccff43679a254e87d11103f4ef88a1d0</param></service></servicedata>

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:edc952878cc73f571d644aaa52d174fc98ab37c6594cfdec74ce137feae1d4c1
size 28682

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9d7870238c5bf72517f9467668043aab2ee6c7ce33354774de22421d72f8e3d9
size 29194

View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jun 25 14:25:02 UTC 2024 - opensuse-releaseteam@opensuse.org
- Update to version 20240625.f75b6e5:
* initial leap 16 repoindex
* Update README.md
- Handle Leap 16 similar to LEAPM 5 vs 6
-------------------------------------------------------------------
Mon Jun 24 06:42:52 UTC 2024 - Lubos Kocman <lubos.kocman@suse.com>

View File

@@ -1,4 +1,4 @@
name: openSUSE-repos
version: 20240621.6fd1ef2
mtime: 1718962563
commit: 6fd1ef2a02653cd396ab47393b49e9315201af32
version: 20240625.f75b6e5
mtime: 1719324889
commit: f75b6e52e07f4ceee637a611d0f98796383b2fe9

View File

@@ -41,11 +41,6 @@ ExclusiveArch: do_not_build
%define theme MicroOS
%define branding microos
%endif
# ALP -> Leap 16 does not use sle_version, ALP also uses is_opensuse 1
%if "%flavor" == "openSUSE-repos-Leap16"
%define theme Leap16
%define branding leap16
%endif
%endif
# LeapMicro 6.0 does not have sle_version any more
@@ -67,6 +62,15 @@ ExclusiveArch: do_not_build
%endif
%endif
# Leap 16
%if 0%{?is_opensuse} && 0%{?suse_version} >= 1600
%if "%flavor" == "openSUSE-repos-Leap"
%define theme Leap
%define branding leap
%define with_nvidia 0
%endif
%endif
%if "%{?theme}" == ""
ExclusiveArch: do_not_build
%endif
@@ -76,7 +80,7 @@ Name: openSUSE-repos
%else
Name: openSUSE-repos-%{theme}
%endif
Version: 20240621.6fd1ef2
Version: 20240625.f75b6e5
Release: 0
Summary: openSUSE package repositories
License: MIT
@@ -105,10 +109,6 @@ Obsoletes: openSUSE-repos-LeapMicro
Obsoletes: openSUSE-repos-Leap
Obsoletes: openSUSE-repos-LeapMicro
%endif
%if "%{?theme}" == "Leap16"
Obsoletes: openSUSE-repos-Leap
Obsoletes: openSUSE-repos-LeapMicro
%endif
%description
Definitions for openSUSE repository management via zypp-services
@@ -136,10 +136,6 @@ Obsoletes: openSUSE-repos-LeapMicro-NVIDIA
Obsoletes: openSUSE-repos-Leap-NVIDIA
Obsoletes: openSUSE-repos-LeapMicro-NVIDIA
%endif
%if "%{?theme}" == "Leap16"
Obsoletes: openSUSE-repos-Leap-NVIDIA
Obsoletes: openSUSE-repos-LeapMicro-NVIDIA
%endif
%description NVIDIA
Definitions for NVIDIA repository management via zypp-services
@@ -189,14 +185,6 @@ Definitions for NVIDIA repository management via zypp-services
%endif
%endif
%if "%{theme}" == "Leap16"
%ifarch %{ix86} x86_64 aarch64
%{_datadir}/zypp/local/service/openSUSE/repo/opensuse-%{branding}-repoindex.xml
%else
%{_datadir}/zypp/local/service/openSUSE/repo/opensuse-%{branding}-ports-repoindex.xml
%endif
%endif
%if 0%{?with_nvidia}
%files NVIDIA
%dir %{_datadir}/zypp/local/service/NVIDIA
@@ -253,12 +241,17 @@ install opensuse-%{branding}5-repoindex.xml -pm 0644 %{buildroot}%{_datadir}/zyp
%endif
%if "%{theme}" == "Leap"
# Leap 16
%if 0%{?is_opensuse} && 0%{?suse_version} == 1600
install opensuse-%{branding}16-repoindex.xml -pm 0644 %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo/opensuse-%{branding}-repoindex.xml
%else
%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
%endif
%if 0%{?with_nvidia}
install nvidia-%{branding}-repoindex.xml -pm 0644 %{buildroot}%{_datadir}/zypp/local/service/NVIDIA/repo