Merge branch 'master' into epel7
This commit is contained in:
commit
950c07b784
@ -7,7 +7,7 @@ worker_processes auto;
|
||||
error_log /var/log/nginx/error.log;
|
||||
pid /run/nginx.pid;
|
||||
|
||||
# Load dynamic modules. See /usr/share/nginx/README.fedora.
|
||||
# Load dynamic modules. See /usr/share/nginx/README.dynamic.
|
||||
include /usr/share/nginx/modules/*.conf;
|
||||
|
||||
events {
|
||||
|
@ -36,7 +36,7 @@ Source101: poweredby.png
|
||||
Source102: nginx-logo.png
|
||||
Source103: 404.html
|
||||
Source104: 50x.html
|
||||
Source200: README.fedora
|
||||
Source200: README.dynamic
|
||||
Source210: UPGRADE-NOTES-1.6-to-1.10
|
||||
|
||||
# removes -Werror in upstream build scripts. -Werror conflicts with
|
||||
@ -356,7 +356,7 @@ fi
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc CHANGES README README.fedora
|
||||
%doc CHANGES README README.dynamic
|
||||
%if 0%{rhel} == 7
|
||||
%doc UPGRADE-NOTES-1.6-to-1.10
|
||||
%endif
|
||||
|
Loading…
Reference in New Issue
Block a user