Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openSUSE-repos for openSUSE:Factory checked in at 2023-07-26 13:24:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-repos (Old) and /work/SRC/openSUSE:Factory/.openSUSE-repos.new.15225 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-repos" Wed Jul 26 13:24:34 2023 rev:7 rq:1100752 version:20230725.c6c492e Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-repos/openSUSE-repos.changes 2023-02-09 16:23:48.902900915 +0100 +++ /work/SRC/openSUSE:Factory/.openSUSE-repos.new.15225/openSUSE-repos.changes 2023-07-26 13:25:42.072635965 +0200 @@ -1,0 +2,13 @@ +Tue Jul 25 13:14:12 UTC 2023 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- openSUSE-repos-20230209.87a5e9e.obscpio openSUSE-repos-20230209.87a5e9e.tar.xz New: ---- openSUSE-repos-20230725.c6c492e.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-repos.spec ++++++ --- /var/tmp/diff_new_pack.gyZINL/_old 2023-07-26 13:25:42.872640793 +0200 +++ /var/tmp/diff_new_pack.gyZINL/_new 2023-07-26 13:25:42.876640817 +0200 @@ -35,6 +35,11 @@ %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 @@ %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-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 @@ %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 @@ %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 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.gyZINL/_old 2023-07-26 13:25:42.932641155 +0200 +++ /var/tmp/diff_new_pack.gyZINL/_new 2023-07-26 13:25:42.936641180 +0200 @@ -1,6 +1,6 @@ <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> (No newline at EOF) ++++++ openSUSE-repos-20230209.87a5e9e.obscpio -> openSUSE-repos-20230725.c6c492e.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-repos-20230209.87a5e9e/README.md new/openSUSE-repos-20230725.c6c492e/README.md --- old/openSUSE-repos-20230209.87a5e9e/README.md 2023-02-09 13:06:48.000000000 +0100 +++ new/openSUSE-repos-20230725.c6c492e/README.md 2023-07-25 15:13:14.000000000 +0200 @@ -16,40 +16,26 @@ $ zypper addservice /somewhere openSUSE # Use openSUSE prefix for all reposistories managed by service $ zypper ref -s # optionally force refresh services + +Repositories managed by zypp-services can be easily identified as they will have openSUSE: prefix (or any other that you have chosen). ``` -## Cleanup of distribution repositories not managed by zypp-services -You might want to remove old duplicate entries in */etc/zypp/repos.d/*. +## Restoring original distribution repositories** +openSUSE-repos does backup of all existing default distribution repo files under /etc/zypp/repos.d/*.rpmsave -Repositories managed by zypp-services can be easily identified as they will have openSUSE: prefix (or any other that you have chosen). +As of today uninstalling openSUSE-repos **will not** restore original distribution repo files. +You can restore original repo files by running following as root. +Note: You should not use rpmconf, as the original file was simply moved under a new name. - -``` -$ ls -la /etc/zypp/repos.d/ | grep -v openSUSE: # skip service managed repos -openSUSE-20220923-0.repo download.opensuse.org-oss.repo -repo-debug.repo download.opensuse.org-tumbleweed.repo -repo-source.repo ``` -**Cleanup of old distribution repositories on a freshly installed openSUSE Tumbleweed** +# zypper remove openSUSE-repos-* +# ls -la /etc/zypp/repos.d/*.rpmsave # review list of repos that will be restored +# for file in /etc/zypp/repos.d/*.rpmsave; do echo mv $file `echo $file | sed -s "s/\.rpmsave//"`; done +# zypper ref ``` -$ sudo rm -f /etc/zypp/repos.d/download.opensuse.org-non-oss.repo \ -/etc/zypp/repos.d/openSUSE-*-0.repo \ -/etc/zypp/repos.d/download.opensuse.org-oss.repo \ -/etc/zypp/repos.d/repo-debug.repo \ -/etc/zypp/repos.d/download.opensuse.org-tumbleweed.repo \ -/etc/zypp/repos.d/repo-source.repo -``` - -**Cleanup of old distribution repositories on a freshly installed openSUSE Leap 15.X** -``` -$ sudo rm -f /etc/zypp/repos.d/repo-backports-debug-update.repo \ -/etc/zypp/repos.d/repo-backports-update.repo \ -/etc/zypp/repos.d/repo-sle-debug-update.repo \ -/etc/zypp/repos.d/repo-sle-update.repo -``` ## How to contribute? @@ -78,7 +64,7 @@ ``` $ osc sr Base:System openSUSE-repos openSUSE:Factory -$ osc sr openSUSE:Factory openSUSE-repos openSUSE:Leap:15.5 # once merged to Factory +$ osc sr openSUSE:Factory openSUSE-repos openSUSE:Leap:15.6 # once merged to Factory ``` That's all. Happy Hacking diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-repos-20230209.87a5e9e/dist/package/openSUSE-repos.spec new/openSUSE-repos-20230725.c6c492e/dist/package/openSUSE-repos.spec --- old/openSUSE-repos-20230209.87a5e9e/dist/package/openSUSE-repos.spec 2023-02-09 13:06:48.000000000 +0100 +++ new/openSUSE-repos-20230725.c6c492e/dist/package/openSUSE-repos.spec 2023-07-25 15:13:14.000000000 +0200 @@ -35,6 +35,11 @@ %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} @@ -81,6 +86,10 @@ 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 @@ %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 @@ %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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-repos-20230209.87a5e9e/opensuse-leap-micro-repoindex.xml new/openSUSE-repos-20230725.c6c492e/opensuse-leap-micro-repoindex.xml --- old/openSUSE-repos-20230209.87a5e9e/opensuse-leap-micro-repoindex.xml 2023-02-09 13:06:48.000000000 +0100 +++ new/openSUSE-repos-20230725.c6c492e/opensuse-leap-micro-repoindex.xml 2023-07-25 15:13:14.000000000 +0200 @@ -1,5 +1,5 @@ <repoindex ttl="0" - disturl="https://download.opensuse.org"; + disturl="https://cdn.opensuse.org"; distsub="leap-micro/" distver="${releasever}" debugenable="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-repos-20230209.87a5e9e/opensuse-leap-ports-repoindex.xml new/openSUSE-repos-20230725.c6c492e/opensuse-leap-ports-repoindex.xml --- old/openSUSE-repos-20230209.87a5e9e/opensuse-leap-ports-repoindex.xml 2023-02-09 13:06:48.000000000 +0100 +++ new/openSUSE-repos-20230725.c6c492e/opensuse-leap-ports-repoindex.xml 2023-07-25 15:13:14.000000000 +0200 @@ -1,5 +1,5 @@ <repoindex ttl="0" - disturl="https://download.opensuse.org"; + disturl="https://cdn.opensuse.org"; distsub="leap/" distver="${releasever}" debugenable="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-repos-20230209.87a5e9e/opensuse-leap-repoindex.xml new/openSUSE-repos-20230725.c6c492e/opensuse-leap-repoindex.xml --- old/openSUSE-repos-20230209.87a5e9e/opensuse-leap-repoindex.xml 2023-02-09 13:06:48.000000000 +0100 +++ new/openSUSE-repos-20230725.c6c492e/opensuse-leap-repoindex.xml 2023-07-25 15:13:14.000000000 +0200 @@ -1,5 +1,5 @@ <repoindex ttl="0" - disturl="https://download.opensuse.org"; + disturl="https://cdn.opensuse.org"; distsub="leap/" distver="${releasever}" debugenable="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-repos-20230209.87a5e9e/opensuse-leap16-repoindex.xml new/openSUSE-repos-20230725.c6c492e/opensuse-leap16-repoindex.xml --- old/openSUSE-repos-20230209.87a5e9e/opensuse-leap16-repoindex.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSE-repos-20230725.c6c492e/opensuse-leap16-repoindex.xml 2023-07-25 15:13:14.000000000 +0200 @@ -0,0 +1,15 @@ +<repoindex ttl="0" + disturl="https://cdn.opensuse.org"; + distsub="leap/" + distver="${releasever}" + debugenable="false" + sourceenable="false"> + +<repo url="%{disturl}/repositories/openSUSE:/Leap:/16.0/standard/" + alias="repo-oss" + name="%{alias} (%{distver})" + enabled="true" + autorefresh="true"/> + + +</repoindex> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-repos-20230209.87a5e9e/opensuse-microos-repoindex.xml new/openSUSE-repos-20230725.c6c492e/opensuse-microos-repoindex.xml --- old/openSUSE-repos-20230209.87a5e9e/opensuse-microos-repoindex.xml 2023-02-09 13:06:48.000000000 +0100 +++ new/openSUSE-repos-20230725.c6c492e/opensuse-microos-repoindex.xml 2023-07-25 15:13:14.000000000 +0200 @@ -1,5 +1,5 @@ <repoindex ttl="0" - disturl="https://download.opensuse.org"; + disturl="https://cdn.opensuse.org"; distsub="tumbleweed/" debugenable="false" sourceenable="false"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-repos-20230209.87a5e9e/opensuse-tumbleweed-repoindex.xml new/openSUSE-repos-20230725.c6c492e/opensuse-tumbleweed-repoindex.xml --- old/openSUSE-repos-20230209.87a5e9e/opensuse-tumbleweed-repoindex.xml 2023-02-09 13:06:48.000000000 +0100 +++ new/openSUSE-repos-20230725.c6c492e/opensuse-tumbleweed-repoindex.xml 2023-07-25 15:13:14.000000000 +0200 @@ -1,5 +1,5 @@ <repoindex ttl="0" - disturl="https://download.opensuse.org"; + disturl="https://cdn.opensuse.org"; distsub="tumbleweed/" debugenable="false" sourceenable="false"> ++++++ openSUSE-repos.obsinfo ++++++ --- /var/tmp/diff_new_pack.gyZINL/_old 2023-07-26 13:25:43.056641903 +0200 +++ /var/tmp/diff_new_pack.gyZINL/_new 2023-07-26 13:25:43.060641927 +0200 @@ -1,5 +1,5 @@ name: openSUSE-repos -version: 20230209.87a5e9e -mtime: 1675944408 -commit: 87a5e9e0c2903c9c29c57b152d4524fa14a493fb +version: 20230725.c6c492e +mtime: 1690290794 +commit: c6c492e89ff51e2d549d6e614a3aa18c2015703d
