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

- Update to version 20230725.c6c492e:
  * rephrase README
  * Keep backup of legacy files as .rpmsave
  * Use cdn-o-o instead of downloadcontentcdn-o-o
  * openSUSE-repos adaptation of CDN
  * improve comment on Leap16 handling
  * Build -Leap16 on ALP/TW like build env
  * correct flavor of Leap16
  * Add Leap 16.0 definitions

OBS-URL: https://build.opensuse.org/request/show/1100626
OBS-URL: https://build.opensuse.org/package/show/Base:System/openSUSE-repos?expand=0&rev=19
This commit is contained in:
2023-07-26 06:43:27 +00:00
committed by Git OBS Bridge
parent 6ad1747c2a
commit 3e1c5a2ef9
6 changed files with 57 additions and 5 deletions

View File

@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/openSUSE-repos.git</param>
<param name="changesrevision">87a5e9e0c2903c9c29c57b152d4524fa14a493fb</param></service></servicedata>
<param name="changesrevision">c6c492e89ff51e2d549d6e614a3aa18c2015703d</param></service></servicedata>

View File

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

View File

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

View File

@@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Jul 25 13:14:12 UTC 2023 - opensuse-releaseteam@opensuse.org
- Update to version 20230725.c6c492e:
* rephrase README
* Keep backup of legacy files as .rpmsave
* Use cdn-o-o instead of downloadcontentcdn-o-o
* openSUSE-repos adaptation of CDN
* improve comment on Leap16 handling
* Build -Leap16 on ALP/TW like build env
* correct flavor of Leap16
* Add Leap 16.0 definitions
-------------------------------------------------------------------
Thu Feb 09 12:48:24 UTC 2023 - opensuse-releaseteam@opensuse.org

View File

@@ -1,4 +1,4 @@
name: openSUSE-repos
version: 20230209.87a5e9e
mtime: 1675944408
commit: 87a5e9e0c2903c9c29c57b152d4524fa14a493fb
version: 20230725.c6c492e
mtime: 1690290794
commit: c6c492e89ff51e2d549d6e614a3aa18c2015703d

View File

@@ -35,6 +35,11 @@ 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
%if 0%{?sle_version}
@@ -61,7 +66,7 @@ Name: openSUSE-repos
%else
Name: openSUSE-repos-%{theme}
%endif
Version: 20230209.87a5e9e
Version: 20230725.c6c492e
Release: 0
Summary: openSUSE package repositories
License: MIT
@@ -81,6 +86,10 @@ 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
@@ -123,6 +132,14 @@ Definitions for openSUSE 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
%prep
%setup -q -n openSUSE-repos-%{version}
@@ -224,6 +241,22 @@ ln -sf opensuse-%{branding}-ports-repoindex.xml %{_datadir}/zypp/local/service/o
%endif
%endif
# Disable all non-zypp-service managed repos with default fileanmes
for repo_file in \
repo-backports-debug-update.repo repo-oss.repo repo-backports-update.repo \
repo-sle-debug-update.repo repo-debug-non-oss.repo repo-sle-update.repo \
repo-debug.repo repo-source.repo repo-debug-update.repo repo-update.repo \
repo-debug-update-non-oss.repo repo-update-non-oss.repo repo-non-oss.repo \
openSUSE-*-0.repo download.opensuse.org-oss.repo download.opensuse.org-tumbleweed.repo \
repo-openh264.repo; do
if [ -f %{_sysconfdir}/zypp/repos.d/$repo_file ]; then
echo "Content of $repo_file will be newly managed by zypp-services."
echo "Storing old copy as {_sysconfdir}/zypp/repos.d/$repo_file.rpmsave"
mv %{_sysconfdir}/zypp/repos.d/$repo_file %{_sysconfdir}/zypp/repos.d/$repo_file.rpmsave
fi
done
# We hereby declare that running this will not influence existing transaction
ZYPP_READONLY_HACK=1 zypper addservice %{_datadir}/zypp/local/service/openSUSE openSUSE