From aa2009c434874b1505157131661621bdb7e42264 Mon Sep 17 00:00:00 2001
From: lingsheng <lingsheng@huawei.com>
Date: Fri, 14 May 2021 17:44:38 +0800
Subject: [PATCH] Fix file conflict in nginx upgrade

(cherry picked from commit 39452cea81f12602aee4f902f42275de19b02b6f)
---
 nginx.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nginx.spec b/nginx.spec
index d1949a5..5636c97 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 <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
 
-- 
Gitee