minor fixes

SPECS/rocky-release.spec

@@ -10,7 +10,7 @@
 %define distro_code  Green Obsidian
 %define major   8
 %define minor   4
-%define rocky_rel 19
+%define rocky_rel 20
 %define upstream_rel %{major}.%{minor}
 
 %define base_release_version %{major}
@@ -79,9 +79,8 @@ Source1220:     Rocky-Media.repo
 #Source1221:     Rocky-Debuginfo.repo
 Source1222:     Rocky-Sources.repo
 Source1223:     Rocky-Devel.repo
-#Source1224:     Rocky-ContinuousRelease.repo
-#Source1225:     Rocky-FastTrack.repo
 Source1226:     Rocky-Plus.repo
+Source1300:     rockylinux.1.gz
 
 %description
 %{distro_name} release files.
@@ -120,6 +119,8 @@ echo "%{distro_name} release %{version} (%{distro_code})" > %{buildroot}%{_sysco
 echo "Derived from Red Hat Enterprise Linux %{version}" > %{buildroot}%{_sysconfdir}/rocky-release-upstream
 ln -s rocky-release %{buildroot}%{_sysconfdir}/system-release
 ln -s rocky-release %{buildroot}%{_sysconfdir}/redhat-release
+mkdir -p %{_mandir}/man1
+install -p -m 0644 %{SOURCE1300} %{buildroot}%{_mandir}/man1/
 
 # Create the os-release file
 install -d -m 0755 %{buildroot}%{_prefix}/lib
@@ -143,7 +144,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}" > %{buildroot}%{_sysconfdir}/system-release-cpe
+echo "cpe:/o:rocky:rocky:%{major}.%{minor}:GA" > %{buildroot}%{_sysconfdir}/system-release-cpe
 
 # create /etc/issue and /etc/issue.net
 echo '\S' > %{buildroot}%{_sysconfdir}/issue
@@ -176,7 +177,6 @@ install -m 0644 %{SOURCE302} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
 
 # dnf stuff
 install -d -m 0755 %{buildroot}%{_sysconfdir}/dnf/vars
-echo "stock" > %{buildroot}%{_sysconfdir}/dnf/vars/infra
 echo "pub/rocky" > %{buildroot}%{_sysconfdir}/dnf/vars/contentdir
 
 # Copy out GPG keys
@@ -215,21 +215,23 @@ install -p -m 0644 %{SOURCE1226} %{buildroot}%{_sysconfdir}/yum.repos.d/
 %{_datadir}/rocky-release
 %{_prefix}/lib/os-release
 %{_prefix}/lib/systemd/system-preset/*
+%{_mandir}/man1/rockylinux.1.gz
 
 %files -n rocky-repos
 %license LICENSE
 %config(noreplace) %{_sysconfdir}/yum.repos.d/Rocky-*.repo
 %config(noreplace) %{_sysconfdir}/dnf/vars/contentdir
-%config(noreplace) %{_sysconfdir}/dnf/vars/infra
 
 %files -n rocky-gpg-keys
 %{_sysconfdir}/pki/rpm-gpg/
 
 %changelog
-* Mon May 24 2021 Louis Abel <label@rockylinux.org> - 8.4-19
+* Mon May 25 2021 Louis Abel <label@rockylinux.org> - 8.4-20
 - Add a version codename to satisfy vendors
 - Change license
-- Fix up os-release
+- Fix up /etc/os-release
+- Fix up CPE
+- Remove unused infra var
 
 * Wed May 19 2021 Louis Abel <label@rockylinux.org> - 8.4-16
 - Remove annoying /etc/issue banner

code

@@ -0,0 +1,3 @@
+8:  Green Obsidian
+9:  Blue Onyx
+10: Smoky Quartz