From f9622a16b92df7647f81fa1a607a71354d2e32ff Mon Sep 17 00:00:00 2001
From: lyn1001 <thistleslyn@163.com>
Date: Fri, 3 Dec 2021 18:17:22 +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 22ef795..c09d8a1 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/
@@ -48,6 +48,7 @@ Requires(post):    systemd
 Requires(preun):   systemd
 Requires(postun):  systemd
 Provides:          webserver
+Requires:          (mailcap >= 2.1.49-3 if mailcap)
 
 %description
 NGINX is a free, open-source, high-performance HTTP server and reverse proxy, 
@@ -347,6 +348,9 @@ fi
 %{_mandir}/man8/nginx.8*
 
 %changelog
+* Fri Dec 3 2021 liyanan <liyanan32@huawei.com> - 1:1.16.1-10
+- Fix file conflict in nginx upgrade
+
 * Tue Jun 15 2021 yanglu <yanglu72@huawei.com> - 1:1.16.1-9
 - Fix CVE-2021-23017
 
-- 
Gitee