fix up CPE values

This commit is contained in:
nazunalika 2022-03-23 17:53:04 -07:00
parent 020f29769e
commit 7cea9c3a6b
Signed by: label
GPG Key ID: 6735C0E1BD65D048

View File

@ -16,7 +16,7 @@
%define distro_code Blue Onyx %define distro_code Blue Onyx
%define major 9 %define major 9
%define minor 0 %define minor 0
%define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.4} %define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.5}
%define rpm_license BSD-3-Clause %define rpm_license BSD-3-Clause
%define dist .el%{major} %define dist .el%{major}
@ -227,7 +227,7 @@ PLATFORM_ID="platform:el%{major}"
PRETTY_NAME="%{distro_name} %{full_release_version}%{?rlstatement: %{rlstatement}} (%{distro_code})" PRETTY_NAME="%{distro_name} %{full_release_version}%{?rlstatement: %{rlstatement}} (%{distro_code})"
ANSI_COLOR="0;32" ANSI_COLOR="0;32"
LOGO="fedora-logo-icon" LOGO="fedora-logo-icon"
CPE_NAME="cpe:/o:rocky:rocky:%{base_release_version}" CPE_NAME="cpe:/o:rocky:rocky:%{major}::baseos"
HOME_URL="https://rockylinux.org/" HOME_URL="https://rockylinux.org/"
BUG_REPORT_URL="https://bugs.rockylinux.org/" BUG_REPORT_URL="https://bugs.rockylinux.org/"
ROCKY_SUPPORT_PRODUCT="%{distro_name}" ROCKY_SUPPORT_PRODUCT="%{distro_name}"
@ -238,7 +238,7 @@ EOF
ln -s ../usr/lib/os-release %{buildroot}%{_sysconfdir}/os-release ln -s ../usr/lib/os-release %{buildroot}%{_sysconfdir}/os-release
# write cpe to /etc/system/release-cpe # write cpe to /etc/system/release-cpe
echo "cpe:/o:rocky:rocky:%{base_release_version}" > %{buildroot}%{_sysconfdir}/system-release-cpe echo "cpe:/o:rocky:rocky:%{major}::baseos" > %{buildroot}%{_sysconfdir}/system-release-cpe
# create /etc/issue and /etc/issue.net, /etc/issue.d # create /etc/issue and /etc/issue.net, /etc/issue.d
echo '\S' > %{buildroot}%{_sysconfdir}/issue echo '\S' > %{buildroot}%{_sysconfdir}/issue
@ -405,10 +405,11 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
%{_datadir}/pki/sb-certs/*.crt %{_datadir}/pki/sb-certs/*.crt
%changelog %changelog
* Tue Feb 08 2022 Louis Abel <label@rockylinux.org> - 9.0-1.4 * Tue Feb 08 2022 Louis Abel <label@rockylinux.org> - 9.0-1.5
- Backport current SB certs for now - Backport current SB certs for now
- Add logrotate timer and switcheroo - Add logrotate timer and switcheroo
- Add missing macros - Add missing macros
- Fix CPE values
* Mon Jan 10 2022 Louis Abel <label@rockylinux.org> - 9.0-1.1 * Mon Jan 10 2022 Louis Abel <label@rockylinux.org> - 9.0-1.1
- Add LOGO to /etc/os-release - Add LOGO to /etc/os-release