diff --git a/nginx.spec b/nginx.spec index d1949a5954f2b5094f316dcb7ece9f39a767ee9f..5636c97af4cfb809b8b8b1a278d988ab7d702500 100644 --- a/nginx.spec +++ b/nginx.spec @@ -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 - 1:1.16.1-10 +- Fix file conflict in nginx upgrade + * Wed May 12 2021 gaihuiying - 1:1.16.1-9 - Fix NGINX pidfile handling