diff --git a/nginx.spec b/nginx.spec index 29a17661101de3f9e7aeaa2114c29ea630bedb8f..2efa51263eda24237b21c2fd04a08c04a3562072 100644 --- a/nginx.spec +++ b/nginx.spec @@ -14,7 +14,7 @@ Name: nginx Epoch: 1 Version: 1.16.1 -Release: 6 +Release: 7 Summary: A HTTP server, reverse proxy and mail proxy server License: BSD URL: http://nginx.org/ @@ -127,7 +127,6 @@ Requires: nginx %description mod-stream Nginx stream modules. -%package_help %prep %autosetup -n %{name}-%{version} -p1 @@ -278,6 +277,9 @@ fi %files %defattr(-,root,root) +%doc CHANGES README README.dynamic +%{_mandir}/man3/nginx.3pm* +%{_mandir}/man8/nginx.8* %license LICENSE %config(noreplace) %{_sysconfdir}/nginx/* %config(noreplace) %{_sysconfdir}/logrotate.d/nginx @@ -337,13 +339,11 @@ fi %{_libdir}/nginx/modules/ngx_stream_module.so %{_datadir}/nginx/modules/mod-stream.conf -%files help -%defattr(-,root,root) -%doc CHANGES README README.dynamic -%{_mandir}/man3/nginx.3pm* -%{_mandir}/man8/nginx.8* %changelog +* Tue Dec 8 2020 Ge Wang - 1:1.16.1-7 +- help package merge to nginx package + * Thu Jul 9 2020 yanan li - 1:1.16.1-6 - Add mime.types file to nginx package