!8 modify patch and html

Merge pull request !8 from jackie_wu123/master

404.html

@@ -108,11 +108,6 @@
                     src="/nginx-logo.png"
                     alt="[ Powered by nginx ]"
                     width="121" height="32" /></a>
-
-                <a href="http://fedoraproject.org/"><img 
-                    src="/poweredby.png"
-                    alt="[ Powered by Fedora ]" 
-                    width="88" height="31" /></a>
             </div>
         </div>
     </body>

50x.html

@@ -108,11 +108,6 @@
                     src="/nginx-logo.png"
                     alt="[ Powered by nginx ]"
                     width="121" height="32" /></a>
-
-                <a href="http://fedoraproject.org/"><img 
-                    src="/poweredby.png"
-                    alt="[ Powered by Fedora ]" 
-                    width="88" height="31" /></a>
             </div>
         </div>
     </body>

nginx-auto-cc-gcc.patch

@@ -1,13 +1,10 @@
 --- a/auto/cc/gcc.orig	2007-03-22 08:34:53.000000000 -0600
 +++ b/auto/cc/gcc	2007-03-22 08:58:47.000000000 -0600
-@@ -172,7 +172,9 @@
+@@ -172,7 +172,6 @@
  
  
  # stop on warning
 -CFLAGS="$CFLAGS -Werror"
-+# This combined with Fedora's FORTIFY_SOURCE=2 option causes it nginx
-+# to not compile.
-+#CFLAGS="$CFLAGS -Werror"
  
  # debug
  CFLAGS="$CFLAGS -g"

nginx.spec

@@ -14,7 +14,7 @@
 Name:              nginx
 Epoch:             1
 Version:           1.16.1
-Release:           2
+Release:           3
 Summary:           A HTTP server, reverse proxy and mail proxy server
 License:           BSD
 URL:               http://nginx.org/
@@ -26,7 +26,6 @@ Source12:          nginx.conf
 Source13:          nginx-upgrade
 Source14:          nginx-upgrade.8
 Source100:         index.html
-Source101:         poweredby.png
 Source102:         nginx-logo.png
 Source103:         404.html
 Source104:         50x.html
@@ -195,7 +194,7 @@ install -p -d -m 0755 .%{_datadir}/nginx/modules
 install -p -d -m 0755 .%{_libdir}/nginx/modules
 install -p -m 0644 %{_builddir}/nginx-%{version}/nginx.conf .%{_sysconfdir}/nginx
 install -p -m 0644 %{SOURCE100} .%{_datadir}/nginx/html
-install -p -m 0644 %{SOURCE101} %{SOURCE102} .%{_datadir}/nginx/html
+install -p -m 0644 %{SOURCE102} .%{_datadir}/nginx/html
 install -p -m 0644 %{SOURCE103} %{SOURCE104} .%{_datadir}/nginx/html
 
 %if 0%{?with_mailcap_mimetypes}
@@ -348,6 +347,9 @@ fi
 %{_mandir}/man8/nginx-upgrade.8*
 
 %changelog
+* Mon May 11 2020 wutao <wutao61@huawei.com> - 1:1.16.1-3
+- modify patch and html
+
 * Wed Mar 18 2020 yuxiangyang <yuxiangyang4@huawei.com> - 1:1.16.1-2
 - delete http_stub_status_module.This configuration creates a simple
   web page with basic status data,but it will affect cpu scale-out because