pool/nginx
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 847117 from home:13ilya:branches:server:http

Browse Source 
- Refresh spec-file via spec-cleaner.
- Use the ngx_* macros from the nginx-macros package to simplify
  the spec file.
- Moved all the modules that support dynamic modules into their own
  modules:
  * nginx-module-geoip2
  * nginx-module-fancyindex
  * nginx-module-headers-more
- The rtmp module is replaced with nginx-module-http-flv

OBS-URL: https://build.opensuse.org/request/show/847117
OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=182
This commit is contained in:
Илья Индиго 2020-11-09 11:10:51 +00:00 committed by Git OBS Bridge
parent b8a0749612
commit 5e524018af
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nginx.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 9 11:07:07 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>
- Refresh spec-file via spec-cleaner.
-------------------------------------------------------------------
Tue Oct 27 20:23:09 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>
@ -11,18 +16,18 @@ Tue Oct 27 20:23:09 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>
-------------------------------------------------------------------
Fri Oct 2 04:14:33 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
- use the ngx_* macros from the nginx-macros package to simplify
the spec file
- Use the ngx_* macros from the nginx-macros package to simplify
the spec file.
-------------------------------------------------------------------
Fri Oct 2 01:58:09 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
- moved all the modules that support dynamic modules into their own
- Moved all the modules that support dynamic modules into their own
modules:
nginx-module-geoip2
nginx-module-fancyindex
nginx-module-headers-more
- the rtmp module is replaced with nginx-module-http-flv
* nginx-module-geoip2
* nginx-module-fancyindex
* nginx-module-headers-more
- The rtmp module is replaced with nginx-module-http-flv
-------------------------------------------------------------------
Wed Sep 30 11:28:16 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>

22
nginx.spec
View File

@ -17,14 +17,10 @@
%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim/%(readlink %{_datadir}/vim/current)}
%define pkg_name nginx
%define nginx_upstream_check_version 0.3.0
%define nginx_upstream_check_module_path nginx_upstream_check_module-%{nginx_upstream_check_version}
%define src_install_dir %{_prefix}/src/%{name}
%if 0%{?is_opensuse}
%bcond_without extra_modules
%else
@ -98,6 +94,10 @@ BuildRequires: zlib-devel
%requires_eq perl
#
Recommends: logrotate
Recommends: nginx-module-fancyindex
Recommends: nginx-module-geoip2
Recommends: nginx-module-headers-more
Recommends: nginx-module-http-flv
Recommends: vim-plugin-nginx
Provides: http_daemon
Provides: httpd
@ -122,11 +122,6 @@ Requires(pre): %insserv_prereq
Requires(pre): shadow
%endif
Recommends: nginx-module-fancyindex
Recommends: nginx-module-geoip2
Recommends: nginx-module-headers-more
Recommends: nginx-module-http-flv
%description
nginx [engine x] is a HTTP server and IMAP/POP3 proxy server written by Igor Sysoev.
It has been running on many heavily loaded Russian sites for more than two years.
@ -148,21 +143,20 @@ This package holds the VIM support for nginx config files.
%package -n nginx-source
Summary: The nginx source
Group: Development/Sources
BuildArch: noarch
Requires: gcc-c++
Requires: gd-devel
Requires: libxslt-devel
Requires: nginx = %{version}
Requires: openssl-devel
Requires: pcre-devel
Requires: pcre-devel
Requires: pkgconfig
Requires: vim
Requires: zlib-devel
%requires_ge nginx-macros
BuildArch: noarch
%if %{with ngx_libatomic}
Requires: libatomic-ops-devel
%endif
Requires: nginx = %{version}
%requires_ge nginx-macros
%description -n nginx-source
The source of nginx [engine x] HTTP server and IMAP/POP3 proxy server.
@ -190,7 +184,7 @@ sed -i 's/^\(#define NGX_LISTEN_BACKLOG \).*/\1-1/' src/os/unix/ngx_linux_config
%build
# FIXME: you should use the %%configure macro
%ngx_configure \
%{ngx_configure} \
%if %{with ngx_extra_modules}
--add-module=%{nginx_upstream_check_module_path} \
%endif