From f1e7acc71b8d4c84bbdbbbf17cab4d865d93af43 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Sun, 1 May 2022 18:15:04 -0700 Subject: [PATCH] fix up os-release --- SPECS/rocky-release.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec index fc55ff3..48fdd75 100644 --- a/SPECS/rocky-release.spec +++ b/SPECS/rocky-release.spec @@ -23,6 +23,8 @@ %define contentdir pub/rocky %define rltype stable +%define os_bug_name Rocky-Linux-%{major} + ################################################################################ # Rocky LookAhead Section # @@ -217,8 +219,8 @@ LOGO="fedora-logo-icon" CPE_NAME="cpe:/o:rocky:rocky:%{major}::baseos" HOME_URL="https://rockylinux.org/" BUG_REPORT_URL="https://bugs.rockylinux.org/" -ROCKY_SUPPORT_PRODUCT="%{distro_name}" -ROCKY_SUPPORT_PRODUCT_VERSION="%{major}%{?rlstatement:-%{rlstatement}}" +ROCKY_SUPPORT_PRODUCT="%{os_bug_name}" +ROCKY_SUPPORT_PRODUCT_VERSION="%{full_release_version}%{?rlstatement:-%{rlstatement}}" REDHAT_SUPPORT_PRODUCT="%{distro_name}" REDHAT_SUPPORT_PRODUCT_VERSION="%{full_release_version}%{?rlstatement: %{rlstatement}}" EOF @@ -410,7 +412,7 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf - Add missing macros - Fix CPE values - Remove /etc/centos-release file -- Add redhat tags to os-release +- Add redhat and fix rocky tags in os-release - Fix GPG key names to be consistent with SIG requirements - Reduce number of repo files - Change testing key to "beta" key from build system