!195 使用_vendor宏代替openEulr固定字段,各OS发行版可使用同源软件包

From: @yue-yuankun 
Reviewed-by: @zengwefeng 
Signed-off-by: @zengwefeng
This commit is contained in:
openeuler-ci-bot 2024-07-02 03:09:40 +00:00 committed by Gitee
commit c26044593f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -8,7 +8,7 @@
Name: httpd Name: httpd
Summary: Apache HTTP Server Summary: Apache HTTP Server
Version: 2.4.58 Version: 2.4.58
Release: 3 Release: 4
License: ASL 2.0 License: ASL 2.0
URL: https://httpd.apache.org/ URL: https://httpd.apache.org/
Source0: https://archive.apache.org/dist/httpd/httpd-%{version}.tar.bz2 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 %autosetup -p1
sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
sed -i 's/openEuler/%{_vendor}/g' config.layout
# Example conf for instances # Example conf for instances
cp $RPM_SOURCE_DIR/instance.conf . cp $RPM_SOURCE_DIR/instance.conf .
@ -212,7 +213,7 @@ export LYNX_PATH=/usr/bin/links
--sbindir=%{_sbindir} --mandir=%{_mandir} --libdir=%{_libdir} \ --sbindir=%{_sbindir} --mandir=%{_mandir} --libdir=%{_libdir} \
--sysconfdir=%{_sysconfdir}/httpd/conf --includedir=%{_includedir}/httpd \ --sysconfdir=%{_sysconfdir}/httpd/conf --includedir=%{_includedir}/httpd \
--libexecdir=%{_libdir}/httpd/modules --datadir=%{contentdir} \ --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-mpms-shared=all --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
--enable-suexec --with-suexec --enable-suexec-capabilities \ --enable-suexec --with-suexec --enable-suexec-capabilities \
--with-suexec-caller=%{suexec_caller} --with-suexec-docroot=%{docroot} \ --with-suexec-caller=%{suexec_caller} --with-suexec-docroot=%{docroot} \
@ -513,6 +514,12 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Wed Jun 08 2024 yueyuankun <yueyuankun@kylinos.cn> - 2.4.58-4
- Type:NA
- ID:NA
- SUG:NA
- DESC: replace openEuler with _vendor
* Wed May 22 2024 zhangyaqi <zhagnyaqi@kylinos.cn> - 2.4.58-3 * Wed May 22 2024 zhangyaqi <zhagnyaqi@kylinos.cn> - 2.4.58-3
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA