Update to 1.0.15 and perform hardened build

This commit is contained in:
Jamie Nguyen 2012-04-19 16:35:35 +01:00
parent 4cdcd0ccc3
commit 669abfd1c4
1 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,4 @@
%global _hardened_build 1
%global nginx_user nginx
%global nginx_group %{nginx_user}
%global nginx_home %{_localstatedir}/lib/nginx
@ -9,7 +10,7 @@
Name: nginx
Epoch: 1
Version: 1.0.14
Version: 1.0.15
Release: 1%{?dist}
Summary: A high performance web server and reverse proxy server
@ -34,7 +35,7 @@ Source104: 50x.html
# removes -Werror in upstream build scripts. -Werror conflicts with
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
Patch0: nginx-auto-cc-gcc.patch
#Patch0: nginx-auto-cc-gcc.patch
BuildRequires: GeoIP-devel
BuildRequires: gd-devel
@ -64,7 +65,7 @@ memory usage.
%prep
%setup -q
%patch0 -p0
#%patch0 -p0
%build
@ -109,7 +110,7 @@ export DESTDIR=%{buildroot}
--with-mail \
--with-mail_ssl_module \
--with-cc-opt="%{optflags} $(pcre-config --cflags)" \
--with-ld-opt="-Wl,-E" # so the perl module finds its symbols
--with-ld-opt="$RPM_LD_FLAGS -Wl,-E" # so the perl module finds its symbols
make %{?_smp_mflags}
@ -212,6 +213,11 @@ fi
%changelog
* Sat Apr 14 2012 Jamie Nguyen <jamie@tomoyolinux.co.uk. - 1:1.0.15-1
- update to upstream release 1.0.15
- no need to apply auto-cc-gcc patch
- add %%global _hardened_build 1
* Thu Mar 15 2012 Jamie Nguyen <jamie@tomoyolinux.co.uk> - 1:1.0.14-1
- update to upstream release 1.0.14
- amend some %%changelog formatting