From 177e81db597dc00946cbfc697b5f6fcae30ae299 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@cloudlinux.com>
Date: Tue, 22 Mar 2022 23:04:54 +0100
Subject: [PATCH] Add codename and some other fixes

---
 almalinux-release.spec | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/almalinux-release.spec b/almalinux-release.spec
index 75814de..6772567 100644
--- a/almalinux-release.spec
+++ b/almalinux-release.spec
@@ -1,14 +1,17 @@
 %global distro  AlmaLinux
+%global release_name Emerald Puma
 %global major   9
 %global minor   0
 
+%global beta Beta
+
 Name:           almalinux-release
 Version:        %{major}.%{minor}
 Release:        1%{?dist}
 Summary:        %{distro} release files
 License:        GPLv2
 URL:            https://almalinux.org
-BuildArch:      noarch
+# BuildArch:      noarch
 
 Provides:       centos-release = %{version}-%{release}
 Provides:       centos-stream-release = %{version}-%{release}
@@ -87,7 +90,7 @@ cp %{SOURCE201} ./docs
 
 # create /etc/system-release and /etc/redhat-release
 install -d -m 0755 %{buildroot}%{_sysconfdir}
-echo "%{distro} release %{major}" > %{buildroot}%{_sysconfdir}/almalinux-release
+echo "%{distro} release %{major}.%{minor}%{?beta: %{beta}} (%{release_name})" > %{buildroot}%{_sysconfdir}/almalinux-release
 ln -s almalinux-release %{buildroot}%{_sysconfdir}/system-release
 ln -s almalinux-release %{buildroot}%{_sysconfdir}/redhat-release
 
@@ -95,26 +98,29 @@ ln -s almalinux-release %{buildroot}%{_sysconfdir}/redhat-release
 install -d -m 0755 %{buildroot}%{_prefix}/lib
 cat > %{buildroot}%{_prefix}/lib/os-release << EOF
 NAME="%{distro}"
-VERSION="%{major}"
+VERSION="%{major}.%{minor}%{?beta: %{beta}} (%{release_name})"
 ID="almalinux"
 ID_LIKE="rhel centos fedora"
-VERSION_ID="%{major}"
+VERSION_ID="%{major}.%{minor}"
 PLATFORM_ID="platform:el%{major}"
-PRETTY_NAME="%{distro} %{major}"
-ANSI_COLOR="0;31"
+PRETTY_NAME="%{distro} %{major}.%{minor}%{?beta: %{beta}} (%{release_name})"
+ANSI_COLOR="0;34"
 LOGO="fedora-logo-icon"
-CPE_NAME="cpe:/o:almalinux:almalinux:%{major}:baseos"
+CPE_NAME="cpe:/o:almalinux:almalinux:%{major}::baseos"
 HOME_URL="https://almalinux.org/"
 BUG_REPORT_URL="https://bugs.almalinux.org/"
-REDHAT_SUPPORT_PRODUCT="%{distro} %{major}"
-REDHAT_SUPPORT_PRODUCT_VERSION="%{distro}"
+REDHAT_SUPPORT_PRODUCT="%{distro}"
+REDHAT_SUPPORT_PRODUCT_VERSION="%{major}.%{minor}%{?beta: %{beta}}"
+ALMALINUX_MANTISBT_PROJECT="AlmaLinux-%{major}"
+ALMALINUX_MANTISBT_PROJECT_VERSION="%{major}.%{minor}"
+
 EOF
 
 # Create the symlink for /etc/os-release
 ln -s ../usr/lib/os-release %{buildroot}%{_sysconfdir}/os-release
 
 # write cpe to /etc/system/release-cpe
-echo "cpe:/o:almalinux:almalinux:%{major}:baseos" > %{buildroot}%{_sysconfdir}/system-release-cpe
+echo "cpe:/o:almalinux:almalinux:%{major}::baseos" > %{buildroot}%{_sysconfdir}/system-release-cpe
 
 # create /etc/issue, /etc/issue.net and /etc/issue.d
 echo '\S' > %{buildroot}%{_sysconfdir}/issue