rpm/nginx
SHA256
1
0
Fork 0
forked from pool/nginx
Code Pull Requests Activity

Accepting request 313585 from home:MargueriteSu:branches:server:http

Browse Source 
update version 1.8.0

OBS-URL: https://build.opensuse.org/request/show/313585
OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=52
This commit is contained in:
Marguerite Su
2015-06-24 16:07:53 +00:00
committed by Git OBS Bridge
parent abc4d45b31
commit 2ecf20024e
11 changed files with 239 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
nginx.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package nginx
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,13 +24,6 @@
%define ngx_log_dir %{_localstatedir}/log/nginx
%define ngx_error_log %{ngx_log_dir}/error.log
%define ngx_access_log %{ngx_log_dir}/access.log
%if 0%{?suse_version} <= 1310
%define ngx_pid_path %{_localstatedir}/run/nginx.pid
%define ngx_lock_path %{_localstatedir}/run/nginx.lock
%else
%define ngx_pid_path /run/nginx.pid
%define ngx_lock_path /run/nginx.lock
%endif
%define ngx_home %{_localstatedir}/lib/nginx
%define ngx_tmp_http %{ngx_home}/tmp/
%define ngx_tmp_proxy %{ngx_home}/proxy/
@@ -41,7 +34,14 @@
%define with_cpp_test 0
%define with_google_perftools 0
%define with_fancyindex 1
%define fancyindex_version 0.3.3
%define fancyindex_version 0.3.5
%if 0%{?suse_version} <= 1310
%define ngx_pid_path %{_localstatedir}/run/nginx.pid
%define ngx_lock_path %{_localstatedir}/run/nginx.lock
%else
%define ngx_pid_path /run/nginx.pid
%define ngx_lock_path /run/nginx.lock
%endif
%if 0%{?suse_version} != 1315
%define with_libatomic 1
%endif
@@ -58,9 +58,8 @@
BuildRequires: systemd
%{?systemd_requires}
%endif
Name: nginx
Version: 1.6.3
Version: 1.8.0
Release: 0
Summary: A HTTP server and IMAP/POP3 proxy server
License: BSD-2-Clause
@@ -70,7 +69,7 @@ Source: http://nginx.org/download/nginx-%{version}.tar.gz
Source1: nginx.init
Source2: nginx.logrotate
Source3: nginx.service
Source4: https://github.com/aperezdc/ngx-fancyindex/archive/v%{fancyindex_version}.zip
Source4: https://github.com/aperezdc/ngx-fancyindex/archive/v%{fancyindex_version}/ngx-fancyindex-%{fancyindex_version}.tar.gz
Source100: nginx.rpmlintrc
# PATCH-FIX-UPSTREAM nginx-0.4.0-no_Werror.patch
Patch0: nginx-0.4.0-no_Werror.patch
@@ -84,33 +83,37 @@ Patch4: nginx-1.6.1-default_config.patch
Patch5: nginx-1.0.15_docs.patch
# PATCH-FIX-UPSTREAM nginx-aio.patch fix support for Linux AIO
Patch6: nginx-aio.patch
%if 0%{?suse_version} > 1310
Patch7: nginx-1.4.4-passenger-4.0.33_fix.patch
%else
BuildRequires: gcc-c++
BuildRequires: gd-devel
BuildRequires: libxslt-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: zlib-devel
%requires_eq perl
Requires(pre): %fillup_prereq
Requires(pre): %insserv_prereq
Requires(pre): pwdutils
Recommends: logrotate
Conflicts: otherproviders(nginx)
Provides: http_daemon
Provides: httpd
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} == 1310
Patch7: nginx-1.4.2-passenger_fix.patch
%else
Patch7: nginx-1.4.4-passenger-3.0.12_fix.patch
%endif
Patch7: nginx-1.4.2-passenger-4.0.18.patch
Patch8: nginx-1.8.0-passenger-4.0.18.patch
%endif
%if 0%{?suse_version} <= 1310
BuildRequires: GeoIP-devel
%else
BuildRequires: libGeoIP-devel
%endif
BuildRequires: gcc-c++
BuildRequires: gd-devel
%if 0%{?with_google_perftools}
BuildRequires: google-perftools-devel
%endif
%if 0%{?with_libatomic}
BuildRequires: libatomic-ops-devel
%endif
BuildRequires: libxslt-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: zlib-devel
%if 0%{?with_passenger}
BuildRequires: curl-devel
BuildRequires: ruby-devel
@@ -118,28 +121,11 @@ BuildRequires: rubygem-passenger
BuildRequires: rubygem-passenger-devel-static
Recommends: packageand(rubygem-passenger:rubygem-passenger-nginx)
%endif
%if 0%{?with_fancyindex}
BuildRequires: unzip
%endif
Conflicts: nginx-0.5 nginx-0.6 nginx-0.7 nginx-0.8 nginx-0.9 nginx-1.0 nginx-1.2 nginx-1.3 nginx-1.4 nginx-1.5 nginx-1.7
Provides: nginx-1.6 = %{version}
%requires_eq perl
PreReq: %fillup_prereq
PreReq: %insserv_prereq
Requires(pre): pwdutils
Recommends: logrotate
Provides: http_daemon
Provides: httpd
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%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.
Author:
-------
Igor Sysoev
%prep
%if 0%{?with_fancyindex}
%setup -q -n %{pkg_name}-%{version} -b4
@@ -164,6 +150,7 @@ if [[ -f "passenger/ext/common/libpassenger_common.a" ]] || \
fi
%endif
%patch7
%patch8
%endif
%if 0%{with_fancyindex}
@@ -195,6 +182,7 @@ sed -i "s/\/var\/run/\/run/" %{_sourcedir}/nginx.init
--without-select_module \
--without-poll_module \
--with-file-aio \
--with-threads \
--with-ipv6 \
--with-http_ssl_module \
%if 0%{?suse_version} > 1220
@@ -209,6 +197,7 @@ sed -i "s/\/var\/run/\/run/" %{_sourcedir}/nginx.init
--with-http_dav_module \
--with-http_flv_module \
--with-http_mp4_module \
--with-http_gunzip_module \
--with-http_gzip_static_module \
--with-http_auth_request_module \
--with-http_random_index_module \
@@ -235,8 +224,8 @@ sed -i "s/\/var\/run/\/run/" %{_sourcedir}/nginx.init
%if 0%{with_fancyindex}
--add-module=../ngx-fancyindex-%{fancyindex_version} \
%endif
--with-md5=/usr \
--with-sha1=/usr \
--with-md5=%{_prefix} \
--with-sha1=%{_prefix} \
%if 0%{?suse_version} > 1220
--with-cc-opt="%{optflags} -fPIE -D_GNU_SOURCE -std=gnu99 -fstack-protector" \
--with-ld-opt="-Wl,-z,relro,-z,now -pie"