From 049fb1ad9b35a79d5a2d3f2fb23bf2779c935030 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Sat, 11 Jun 2022 08:00:03 -0700 Subject: [PATCH] remove nplb --- SOURCES/rocky-devel.repo | 13 ++----------- SPECS/rocky-release.spec | 5 +++-- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/SOURCES/rocky-devel.repo b/SOURCES/rocky-devel.repo index f6edbbc..c602e0e 100644 --- a/SOURCES/rocky-devel.repo +++ b/SOURCES/rocky-devel.repo @@ -3,8 +3,8 @@ # devel and no-package-left-behind [devel] -name=Rocky Linux $releasever - Devel WARNING! FOR BUILDROOT ONLY -#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Devel-$releasever&rltype=$rltype +name=Rocky Linux $releasever - Devel WARNING! FOR BUILDROOT ONLY DO NOT LEAVE ENABLED +#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=devel-$releasever&rltype=$rltype baseurl=http://dl.rockylinux.org/$contentdir/$releasever/devel/$basearch/os/ gpgcheck=1 enabled=0 @@ -12,12 +12,3 @@ countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing -[nplb] -name=Rocky Linux $releasever - NPLB - WARNING! DO NOT LEAVE PERMANENTLY ENABLED -#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=nplb-$releasever&rltype=$rltype -baseurl=http://dl.rockylinux.org/$contentdir/$releasever/nplb/$basearch/os/ -gpgcheck=1 -enabled=0 -countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 - file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9-Testing diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec index 4084eb6..f83e241 100644 --- a/SPECS/rocky-release.spec +++ b/SPECS/rocky-release.spec @@ -20,7 +20,7 @@ %define distro_code Blue Onyx %define major 9 %define minor 0 -%define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.18} +%define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.19} %define rpm_license BSD-3-Clause %define dist .el%{major} @@ -415,7 +415,7 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf %{_datadir}/pki/sb-certs/* %changelog -* Sun May 01 2022 Louis Abel - 9.0-1.18 +* Sat Jun 11 2022 Louis Abel - 9.0-1.19 - Backport current SB certs for now - Add logrotate timer and switcheroo - Add missing macros @@ -429,6 +429,7 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf - List both GPG keys in repo files - Fix rlpkg macro for gpg keys - Add sig content dir +- Remove nplb as devel is technically it * Mon Jan 10 2022 Louis Abel - 9.0-1.1 - Add LOGO to /etc/os-release