diff --git a/httpd.spec b/httpd.spec index 8e8ee8b..06173ae 100644 --- a/httpd.spec +++ b/httpd.spec @@ -24,7 +24,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.57 -Release: 1%{?dist} +Release: 2%{?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 @@ -602,7 +602,7 @@ cp -p $RPM_BUILD_ROOT%{_libdir}/httpd/build/config_vars.mk \ $RPM_BUILD_ROOT%{_libdir}/httpd/build/vendor_config_vars.mk # Sanitize CFLAGS & LIBTOOL in standard config_vars.mk -sed -e '/^CFLAGS/s,=.*$,= -O2 -g -Wall,' \ +sed -e '/^[A-Z]*FLAGS = /s,-specs[^ ]*,,g' \ -e '/^LIBTOOL/s,/.*/libtool,%{_bindir}/libtool,' \ -i $RPM_BUILD_ROOT%{_libdir}/httpd/build/config_vars.mk diff -u $RPM_BUILD_ROOT%{_libdir}/httpd/build/vendor_config_vars.mk \ @@ -850,6 +850,9 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Fri Jun 23 2023 Joe Orton - 2.4.57-2 +- also sanitize LDFLAGS/CXXFLAGS in non-vendor config_vars.mk + * Tue Apr 11 2023 Luboš Uhliarik - 2.4.57-1 - new version 2.4.57