Fix file conflict in nginx upgrade

(cherry picked from commit 39452cea81f12602aee4f902f42275de19b02b6f)
This commit is contained in:
lingsheng 2021-05-14 17:44:38 +08:00 committed by openeuler-sync-bot
parent 94e36615f5
commit aa2009c434

View File

@ -14,7 +14,7 @@
Name: nginx
Epoch: 1
Version: 1.16.1
Release: 9
Release: 10
Summary: A HTTP server, reverse proxy and mail proxy server
License: BSD
URL: http://nginx.org/
@ -47,6 +47,9 @@ Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
Provides: webserver
Provides: %{name}-help = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-help < %{epoch}:%{version}-%{release}
Requires: (mailcap >= 2.1.49-3 if mailcap)
%description
NGINX is a free, open-source, high-performance HTTP server and reverse proxy,
@ -343,6 +346,9 @@ fi
%changelog
* Fri May 14 2021 lingsheng <lingsheng@huawei.com> - 1:1.16.1-10
- Fix file conflict in nginx upgrade
* Wed May 12 2021 gaihuiying <gaihuiying1@huawei.com> - 1:1.16.1-9
- Fix NGINX pidfile handling