!123 Reduce the dependency of httpd on system-logos installation

From: @chengyechun 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
This commit is contained in:
openeuler-ci-bot 2022-12-15 08:23:38 +00:00 committed by Gitee
commit 7957bd91cb
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.51 Version: 2.4.51
Release: 8 Release: 9
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
@ -90,7 +90,7 @@ Patch35: backport-CVE-2022-28330.patch
BuildRequires: gcc autoconf pkgconfig findutils xmlto perl-interpreter perl-generators systemd-devel BuildRequires: gcc autoconf pkgconfig findutils xmlto perl-interpreter perl-generators systemd-devel
BuildRequires: zlib-devel libselinux-devel lua-devel brotli-devel BuildRequires: zlib-devel libselinux-devel lua-devel brotli-devel
BuildRequires: apr-devel >= 1.5.0 apr-util-devel >= 1.5.0 pcre2-devel BuildRequires: apr-devel >= 1.5.0 apr-util-devel >= 1.5.0 pcre2-devel
Requires: mailcap system-logos mod_http2 Requires: mailcap system-logos-httpd mod_http2
Requires: httpd-tools = %{version}-%{release} httpd-filesystem = %{version}-%{release} Requires: httpd-tools = %{version}-%{release} httpd-filesystem = %{version}-%{release}
Requires(pre): httpd-filesystem Requires(pre): httpd-filesystem
Requires(preun): systemd-units Requires(preun): systemd-units
@ -518,6 +518,12 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Thu Dec 15 2022 chengyechun <chengyechun1@huawei.com> - 2.4.51-9
- Type:bugfix
- ID:
- SUG:restart
- DESC:reduce the dependency of httpd on system-logos installation
* Tue Dec 13 2022 chengyechun <chengyechun1@huawei.com> - 2.4.51-8 * Tue Dec 13 2022 chengyechun <chengyechun1@huawei.com> - 2.4.51-8
- Type:bugfix - Type:bugfix
- ID: - ID: