From f4274bdb45d98faab176b1f87b3444f5cb254195 Mon Sep 17 00:00:00 2001
From: lingsheng <lingsheng@huawei.com>
Date: Tue, 22 Jun 2021 10:49:03 +0800
Subject: [PATCH] Fix file conflict in nginx upgrade

---
 nginx.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nginx.spec b/nginx.spec
index b5fd271..e87ca0a 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -14,7 +14,7 @@
 Name:              nginx
 Epoch:             1
 Version:           1.16.1
-Release:           10
+Release:           11
 Summary:           A HTTP server, reverse proxy and mail proxy server
 License:           BSD
 URL:               http://nginx.org/
@@ -49,6 +49,7 @@ Requires(preun):   systemd
 Requires(postun):  systemd
 Recommends:        nginx-help
 Provides:          webserver
+Requires:          (mailcap >= 2.1.49-3 if mailcap)
 
 %description
 NGINX is a free, open-source, high-performance HTTP server and reverse proxy, 
@@ -348,6 +349,9 @@ fi
 %{_mandir}/man8/nginx.8*
 
 %changelog
+* Tue Jun 22 2021 lingsheng <lingsheng@huawei.com> - 1:1.16.1-11
+- Fix file conflict in nginx upgrade
+
 * Tue Jun 15 2021 yanglu <yanglu72@huawei.com> - 1:1.16.1-10
 - Fix CVE-2021-23017
 
-- 
Gitee