packages/nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!37 [sync] PR-36: Fix file conflict in nginx upgrade

Browse Source 
From: @openeuler-sync-bot
Reviewed-by: @licihua
Signed-off-by: @licihua
This commit is contained in:
openeuler-ci-bot 2021-05-17 17:20:59 +08:00 committed by Gitee
commit edfdfb130f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nginx.spec
View File

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