From 071349d60711d546742992f4eca47ea33b6b1c72 Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Thu, 20 Apr 2023 11:35:23 +0300 Subject: [PATCH] Disables CRB repo by default and adds Extras repo config --- SOURCES/msvsphere-crb.repo | 2 +- SOURCES/msvsphere-extras.repo | 30 ++++++++++++++++++++++++++++++ SPECS/sphere-release.spec | 9 ++++++++- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 SOURCES/msvsphere-extras.repo diff --git a/SOURCES/msvsphere-crb.repo b/SOURCES/msvsphere-crb.repo index e6232ad..840db6a 100644 --- a/SOURCES/msvsphere-crb.repo +++ b/SOURCES/msvsphere-crb.repo @@ -2,7 +2,7 @@ name=MSVSphere $releasever - CRB mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/crb # baseurl=https://repo.inferitos.ru/msvsphere/$releasever/CRB/$basearch/os/ -enabled=1 +enabled=0 gpgcheck=1 countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 diff --git a/SOURCES/msvsphere-extras.repo b/SOURCES/msvsphere-extras.repo new file mode 100644 index 0000000..853f47e --- /dev/null +++ b/SOURCES/msvsphere-extras.repo @@ -0,0 +1,30 @@ +[extras] +name=MSVSphere $releasever - Extras +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/extras +# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/Extras/$basearch/os/ +enabled=1 +gpgcheck=1 +countme=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=1 + +[extras-debug] +name=MSVSphere $releasever - Extras - Debug +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/extras-debug +# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/Extras/debug/$basearch/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=0 + +[extras-source] +name=MSVSphere $releasever - Extras - Source +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/extras-source +# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/Extras/Source/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=0 diff --git a/SPECS/sphere-release.spec b/SPECS/sphere-release.spec index 9fd6912..e80a1cd 100644 --- a/SPECS/sphere-release.spec +++ b/SPECS/sphere-release.spec @@ -5,7 +5,7 @@ Name: sphere-release Version: %{major}.%{minor} -Release: 1.5%{?dist} +Release: 1.6%{?dist} Summary: %{distro} release files License: GPLv2 URL: https://msvsphere.ru @@ -53,6 +53,7 @@ Source403: spheresecureboot001.cer Source500: msvsphere-baseos.repo Source501: msvsphere-appstream.repo Source502: msvsphere-crb.repo +Source503: msvsphere-extras.repo %description %{distro} release files. @@ -193,6 +194,7 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/yum.repos.d install -p -m 0644 %{SOURCE500} %{buildroot}%{_sysconfdir}/yum.repos.d/ install -p -m 0644 %{SOURCE501} %{buildroot}%{_sysconfdir}/yum.repos.d/ install -p -m 0644 %{SOURCE502} %{buildroot}%{_sysconfdir}/yum.repos.d/ +install -p -m 0644 %{SOURCE503} %{buildroot}%{_sysconfdir}/yum.repos.d/ # copy GPG keys install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg @@ -229,6 +231,7 @@ install -p -m 0644 %{SOURCE100} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-baseos.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-appstream.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-crb.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-extras.repo %config(noreplace) %{_sysconfdir}/dnf/vars/stream %files -n sphere-gpg-keys @@ -236,6 +239,10 @@ install -p -m 0644 %{SOURCE100} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %changelog +* Thu Apr 20 2023 Eugene Zamriy - 9.1-1.6 +- Disabled CRB repo by default +- Added Extras repository config + * Mon Apr 10 2023 Eugene Zamriy - 9.1-1.5 - Added EULA