forked from pool/nginx
Accepting request 875591 from home:darix:apps
- Drop nginx_upstream_check module, there is no support for dynamic loading upstream and the module seems kind of unmaintained. OBS-URL: https://build.opensuse.org/request/show/875591 OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=190
This commit is contained in:
committed by
Git OBS Bridge
parent
f3588c7568
commit
0a2b98db54
24
nginx.spec
24
nginx.spec
@@ -18,14 +18,7 @@
|
||||
|
||||
%{!?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
|
||||
%bcond_with extra_modules
|
||||
%endif
|
||||
# keep in sync with %ngx_conditionals
|
||||
%bcond_with ngx_cpp_test
|
||||
%bcond_with ngx_google_perftools
|
||||
@@ -43,7 +36,6 @@ Source0: https://nginx.org/download/%{name}-%{version}.tar.gz
|
||||
Source1: nginx.init
|
||||
Source2: nginx.logrotate
|
||||
Source3: nginx.service
|
||||
Source4: https://github.com/yaoweibin/nginx_upstream_check_module/archive/v%{nginx_upstream_check_version}/%{nginx_upstream_check_module_path}.tar.gz
|
||||
Source9: nginx.sysusers
|
||||
Source100: nginx.rpmlintrc
|
||||
Source101: https://nginx.org/download/%{name}-%{version}.tar.gz.asc
|
||||
@@ -59,8 +51,6 @@ Patch3: nginx-1.6.1-default_config.patch
|
||||
# PATCH-FIX-UPSTREAM nginx-aio.patch fix support for Linux AIO
|
||||
Patch4: nginx-aio.patch
|
||||
# PATCH-FIX-UPSTREAM check_1.9.2+.patch
|
||||
Patch5: check_1.9.2+.patch
|
||||
# keep Buildrequires for the libraries and everything in sync with the requires in the nginx-source package
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gd-devel
|
||||
BuildRequires: libxslt-devel
|
||||
@@ -131,15 +121,12 @@ Requires: libatomic-ops-devel
|
||||
The source of nginx [engine x] HTTP server and IMAP/POP3 proxy server.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{pkg_name}-%{version} -a 4
|
||||
%setup -q -n %{pkg_name}-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4 -p1
|
||||
%if %{with ngx_extra_modules}
|
||||
%patch5
|
||||
%endif
|
||||
|
||||
perl -pi -e 's|\r\n|\n|g' contrib/geo2nginx.pl
|
||||
# we just use lib here because nginx loads them relative to _prefix
|
||||
@@ -152,11 +139,7 @@ sed -i "s/\/var\/run/\/run/" conf/nginx.conf
|
||||
sed -i 's/^\(#define NGX_LISTEN_BACKLOG \).*/\1-1/' src/os/unix/ngx_linux_config.h
|
||||
|
||||
%build
|
||||
# FIXME: you should use the %%configure macro
|
||||
%{ngx_configure} \
|
||||
%if %{with ngx_extra_modules}
|
||||
--add-module=%{nginx_upstream_check_module_path} \
|
||||
%endif
|
||||
%{ngx_configure}
|
||||
|
||||
%make_build
|
||||
%sysusers_generate_pre %{SOURCE9} nginx
|
||||
@@ -203,9 +186,6 @@ copydocs() {
|
||||
popd
|
||||
}
|
||||
|
||||
copydocs %{nginx_upstream_check_module_path} \
|
||||
doc/*
|
||||
|
||||
%pre -f nginx.pre
|
||||
%service_add_pre nginx.service
|
||||
|
||||
|
Reference in New Issue
Block a user