help package merge to nginx package

This commit is contained in:
wang--ge 2020-12-07 18:07:24 +08:00
parent 1dafbb53c3
commit 2e62549366

View File

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