From 420b21978b1282ab43cde9f3c6319a9fa0f1f678 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Sat, 11 Dec 2021 16:59:44 -0700 Subject: [PATCH] reduce CPE --- SPECS/rocky-release.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec index c9b609b..d388ce8 100644 --- a/SPECS/rocky-release.spec +++ b/SPECS/rocky-release.spec @@ -10,7 +10,7 @@ %define distro_code Green Obsidian %define major 8 %define minor 5 -%define rocky_rel 1 +%define rocky_rel 2 %define upstream_rel %{major}.%{minor} %define rpm_license BSD-3-Clause @@ -138,7 +138,7 @@ VERSION_ID="%{major}.%{minor}" PLATFORM_ID="platform:el%{major}" PRETTY_NAME="%{distro_name} %{major}.%{minor} (%{distro_code})" ANSI_COLOR="0;32" -CPE_NAME="cpe:/o:rocky:rocky:%{major}:GA" +CPE_NAME="cpe:/o:rocky:rocky:%{base_release_version}:GA" HOME_URL="https://rockylinux.org/" BUG_REPORT_URL="https://bugs.rockylinux.org/" ROCKY_SUPPORT_PRODUCT="%{distro_name}" @@ -149,7 +149,7 @@ EOF ln -s ../usr/lib/os-release %{buildroot}%{_sysconfdir}/os-release # write cpe to /etc/system/release-cpe -echo "cpe:/o:rocky:rocky:%{major}.%{minor}:GA" > %{buildroot}%{_sysconfdir}/system-release-cpe +echo "cpe:/o:rocky:rocky:%{base_release_version}:GA" > %{buildroot}%{_sysconfdir}/system-release-cpe # create /etc/issue and /etc/issue.net echo '\S' > %{buildroot}%{_sysconfdir}/issue @@ -235,6 +235,9 @@ install -p -m 0644 %{SOURCE1226} %{buildroot}%{_sysconfdir}/yum.repos.d/ %{_sysconfdir}/pki/rpm-gpg/ %changelog +* Sat Dec 11 2021 Louis Abel - 8.5-2 +- Fix CPE to match upstreamed Rocky data + * Tue Oct 05 2021 Louis Abel - 8.5-1 - 8.5 prepatory release