From ca687834d22c8a9494e51597994b7b02f4f25967 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mar 17 2022 01:27:30 +0000 Subject: Drop -hotfixes repo subpackage as the repo doesn't exist for 9 --- diff --git a/SOURCES/CentOS-Stream-Hyperscale-Hotfixes.repo b/SOURCES/CentOS-Stream-Hyperscale-Hotfixes.repo deleted file mode 100644 index b2ee2ad..0000000 --- a/SOURCES/CentOS-Stream-Hyperscale-Hotfixes.repo +++ /dev/null @@ -1,30 +0,0 @@ -[centos-hyperscale-hotfixes] -name=CentOS Stream $releasever - Hyperscale Hotfixes -metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-hotfixes-$stream&arch=$basearch&protocol=https,http -#baseurl=http://mirror.stream.centos.org/SIGs/$stream/hyperscale/$basearch/packages-hotfixes/ -gpgcheck=1 -enabled=1 -countme=1 -priority=50 -module_hotfixes=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-HyperScale - -[centos-hyperscale-hotfixes-debuginfo] -name=CentOS Stream $releasever - Hyperscale Hotfixes - Debug -metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-hotfixes-debug-$stream&arch=$basearch&protocol=https,http -#baseurl=http://mirror.stream.centos.org/SIGs/$stream/hyperscale/$basearch/packages-hotfixes/debug/ -gpgcheck=1 -enabled=0 -priority=50 -module_hotfixes=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-HyperScale - -[centos-hyperscale-hotfixes-source] -name=CentOS Stream $releasever - Hyperscale Hotfixes - Source -metalink=https://mirrors.centos.org/metalink?repo=centos-hyperscale-sig-packages-hotfixes-$stream&arch=source&protocol=https,http -#baseurl=http://mirror.stream.centos.org/SIGs/$stream/hyperscale/source/packages-hotfixes/ -gpgcheck=1 -enabled=0 -priority=50 -module_hotfixes=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-HyperScale diff --git a/SPECS/centos-release-hyperscale.spec b/SPECS/centos-release-hyperscale.spec index 6c711c9..8b42331 100644 --- a/SPECS/centos-release-hyperscale.spec +++ b/SPECS/centos-release-hyperscale.spec @@ -1,14 +1,13 @@ Summary: CentOS Hyperscale SIG main repo configs Name: centos-release-hyperscale Version: 9 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 URL: http://wiki.centos.org/SpecialInterestGroup/Hyperscale Source0: RPM-GPG-KEY-CentOS-SIG-HyperScale Source1: CentOS-Stream-Hyperscale.repo Source2: CentOS-Stream-Hyperscale-Experimental.repo -Source3: CentOS-Stream-Hyperscale-Hotfixes.repo -Source4: CentOS-Stream-Hyperscale-Spin.repo +Source3: CentOS-Stream-Hyperscale-Spin.repo BuildArch: noarch @@ -16,6 +15,9 @@ Requires: centos-stream-release Requires: epel-release = %{rhel} Requires: epel-next-release = %{rhel} +# We don't actually *have* hotfixes repo for the moment +Obsoletes: %{name}-hotfixes < 9-4 + %description Configs for the CentOS Hyperscale SIG main package repository. @@ -26,13 +28,6 @@ Requires: %{name} = %{version}-%{release} %description experimental Configs for the CentOS Hyperscale SIG experimental package repository. -%package hotfixes -Summary: CentOS Hyperscale SIG module hotfixes repo configs -Requires: %{name} = %{version}-%{release} - -%description hotfixes -Configs for the CentOS Hyperscale SIG module hotfixes repository. - %package spin Summary: CentOS Hyperscale SIG spin repo configs Requires: %{name} = %{version}-%{release} @@ -47,7 +42,7 @@ Configs for the CentOS Hyperscale SIG spin repository. install -d %{buildroot}%{_sysconfdir}/pki/rpm-gpg install -p -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/rpm-gpg install -d %{buildroot}%{_sysconfdir}/yum.repos.d -install -p -m 644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ +install -p -m 644 %{SOURCE1} %{SOURCE2} %{SOURCE3} \ %{buildroot}%{_sysconfdir}/yum.repos.d %files @@ -60,13 +55,13 @@ install -p -m 644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-HyperScale %config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Stream-Hyperscale-Experimental.repo -%files hotfixes -%config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Stream-Hyperscale-Hotfixes.repo - %files spin %config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Stream-Hyperscale-Spin.repo %changelog +* Wed Mar 16 2022 Neal Gompa - 9-4 +- Drop -hotfixes repo subpackage as the repo doesn't exist for 9 + * Sun Mar 06 2022 Neal Gompa - 9-3 - Add debuginfo repositories, Refresh GPG public key, and enable DNF countme