From 042a9898a68aa561648c1e6b4bdc06650fc49819 Mon Sep 17 00:00:00 2001 From: chengyechun Date: Tue, 9 Jul 2024 16:34:49 +0800 Subject: [PATCH] replace openEuler with _vendor --- httpd.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/httpd.spec b/httpd.spec index e0592ba..6254990 100644 --- a/httpd.spec +++ b/httpd.spec @@ -8,7 +8,7 @@ Name: httpd Summary: Apache HTTP Server Version: 2.4.58 -Release: 3 +Release: 4 License: ASL 2.0 URL: https://httpd.apache.org/ Source0: https://archive.apache.org/dist/httpd/httpd-%{version}.tar.bz2 @@ -175,6 +175,7 @@ Ths module provides session support for per-user. %autosetup -p1 sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in +sed -i 's/openEuler/%{_vendor}/g' config.layout # Example conf for instances cp $RPM_SOURCE_DIR/instance.conf . @@ -212,7 +213,7 @@ export LYNX_PATH=/usr/bin/links --sbindir=%{_sbindir} --mandir=%{_mandir} --libdir=%{_libdir} \ --sysconfdir=%{_sysconfdir}/httpd/conf --includedir=%{_includedir}/httpd \ --libexecdir=%{_libdir}/httpd/modules --datadir=%{contentdir} \ - --with-installbuilddir=%{_libdir}/httpd/build --enable-layout=openEuler \ + --with-installbuilddir=%{_libdir}/httpd/build --enable-layout=%{_vendor} \ --enable-mpms-shared=all --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ --enable-suexec --with-suexec --enable-suexec-capabilities \ --with-suexec-caller=%{suexec_caller} --with-suexec-docroot=%{docroot} \ @@ -513,6 +514,12 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Tue Jul 09 2024 chengyechun - 2.4.58-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:replace openEuler with _vendor + * Wed May 22 2024 zhangyaqi - 2.4.58-3 - Type:bugfix - ID:NA -- Gitee