From ec4da30e9ba34e7e70c0eee8c71d6fe0b8e6a229 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 6 Dec 2021 19:39:06 -0500 Subject: [PATCH] Use NAME from os-release(5) for vendor string Resolves: #2029071 - httpd on CentOS identifies as RHEL Signed-off-by: Neal Gompa --- httpd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/httpd.spec b/httpd.spec index 0af9427..8d5b172 100644 --- a/httpd.spec +++ b/httpd.spec @@ -3,7 +3,7 @@ %define suexec_caller apache %define mmn 20120211 %define mmnisa %{mmn}%{__isa_name}%{__isa_bits} -%define vstring %(source /etc/os-release; echo ${REDHAT_SUPPORT_PRODUCT}) +%define vstring %(source /etc/os-release; echo ${NAME}) %if 0%{?fedora} > 26 || 0%{?rhel} > 7 %global mpm event %else @@ -13,7 +13,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.51 -Release: 3%{?dist} +Release: 4%{?dist} URL: https://httpd.apache.org/ Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc @@ -809,6 +809,10 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Mon Dec 06 2021 Neal Gompa - 2.4.51-4 +- Use NAME from os-release(5) for vendor string + Resolves: #2029071 - httpd on CentOS identifies as RHEL + * Fri Dec 3 2021 Joe Orton - 2.4.51-3 - add fixes for static analyzer issues (#1938740)