[nginx/f18] Enable debugging (#956845) and gperftools module
Jamie Nguyen
jamielinux at fedoraproject.org
Fri Apr 26 20:28:36 UTC 2013
commit 54fed56fc1862a8b0a5b48e61d82a91fa5cd4336
Author: Jamie Nguyen <j at jamielinux.com>
Date: Fri Apr 26 21:28:09 2013 +0100
Enable debugging (#956845) and gperftools module
nginx.spec | 160 ++++++------------------------------------------------------
1 files changed, 15 insertions(+), 145 deletions(-)
---
diff --git a/nginx.spec b/nginx.spec
index 7d4fd46..0627f27 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -11,7 +11,7 @@
Name: nginx
Epoch: 1
Version: 1.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A high performance web server and reverse proxy server
Group: System Environment/Daemons
@@ -39,6 +39,7 @@ Patch0: nginx-auto-cc-gcc.patch
BuildRequires: GeoIP-devel
BuildRequires: gd-devel
+BuildRequires: gperftools-devel
BuildRequires: libxslt-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
@@ -109,6 +110,9 @@ export DESTDIR=%{buildroot}
--with-http_perl_module \
--with-mail \
--with-mail_ssl_module \
+ --with-pcre \
+ --with-google_perftools_module \
+ --with-debug \
--with-cc-opt="%{optflags} $(pcre-config --cflags)" \
--with-ld-opt="$RPM_LD_FLAGS -Wl,-E" # so the perl module finds its symbols
@@ -151,13 +155,11 @@ install -p -D -m 0644 %{SOURCE14} %{buildroot}%{_mandir}/man8/nginx-upgrade.8
%pre
-if [ $1 -eq 1 ]; then
- getent group %{nginx_group} > /dev/null || groupadd -r %{nginx_group}
- getent passwd %{nginx_user} > /dev/null || \
- useradd -r -d %{nginx_home} -g %{nginx_group} \
- -s /sbin/nologin -c "Nginx web server" %{nginx_user}
- exit 0
-fi
+getent group %{nginx_group} > /dev/null || groupadd -r %{nginx_group}
+getent passwd %{nginx_user} > /dev/null || \
+ useradd -r -d %{nginx_home} -g %{nginx_group} \
+ -s /sbin/nologin -c "Nginx web server" %{nginx_user}
+exit 0
%post
%systemd_post nginx.service
@@ -210,6 +212,11 @@ fi
%changelog
+* Fri Apr 26 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.2.8-2
+- enable google perftools module and add gperftools-devel to BR
+- enable debugging (#956845)
+- trim changelog
+
* Tue Apr 02 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.2.8-1
- update to upstream release 1.2.8
@@ -385,140 +392,3 @@ fi
* Fri Dec 04 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.64-1
- Update to new stable 0.7.64
-
-* Tue Oct 29 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.63-1
-- Update to new stable 0.7.63
-- reinstate zlib dependency
-
-* Mon Sep 14 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.62-1
-- Update to new stable 0.7.62
-- fixes CVE-2009-2629
-- fix rpmlint zlib dependency complaint
-
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.7.61-2
-- rebuilt with new openssl
-
-* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.7.61-1
-- Update to new stable 0.7.61
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.36-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sun May 17 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.36-2
-- init script updates from Gena Makhomed
-- remove nginx-upstream-fair
-
-* Sat Apr 11 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.36-1
-- update to 0.6.36
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.35-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Feb 19 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.35-2
-- rebuild
-
-* Thu Feb 19 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.35-1
-- update to 0.6.35
-
-* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.34-2
-- rebuild with new openssl
-
-* Tue Dec 30 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.34-1
-- update to 0.6.34
-
-* Thu Dec 4 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.6.33-2
-- Fix inclusion of /usr/share/nginx tree => no unowned directories.
-
-* Sun Nov 23 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.33-1
-- update to 0.6.33
-
-* Tue Jul 22 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.32-1
-- update to 0.6.32
-- nginx now supports DESTDIR so removed the patches that enabled it
-
-* Mon May 26 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.31-3
-- init script fixes
-- resolve 'listen 80 default' [#447873]
-
-* Mon May 12 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.31-2
-- update to 0.6.31
-
-* Sun May 11 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.30-2
-- upate to new upstream stable branch 0.6
-- added 3rd party module nginx-upstream-fair
-- added default webpages
-
-* Sun Apr 20 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.35-2
-- update init script to match recommended guidelines
-- add /etc/nginx/conf.d support [#443280]
-- use /etc/sysconfig/nginx to determine nginx.conf [#442708]
-
-* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.35-3
-- add Requires for versioned perl (libperl.so)
-- drop silly file Requires
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.35-2
-- Autorebuild for GCC 4.3
-
-* Sat Jan 19 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.35-1
-- update to 0.5.35
-
-* Sat Dec 15 2007 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.34-1
-- update to 0.5.34
-
-* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.5.33-2
- - Rebuild for deps
-
-* Sun Nov 11 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.33-1
-- update to 0.5.33
-
-* Mon Sep 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.32-1
-- updated to 0.5.32
-- fixed rpmlint UTF-8 complaints.
-
-* Sat Aug 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.31-2
-- added --with-http_stub_status_module build option.
-- added --with-http_sub_module build option.
-- added use of pcre-config --cflags
-
-* Fri Aug 17 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.31-1
-- Update to 0.5.31
-- specify license is BSD
-
-* Sat Aug 11 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.30-2
-- Add BuildRequires: perl-devel - fixing rawhide build
-
-* Mon Jul 30 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.30-1
-- Update to 0.5.30
-
-* Tue Jul 24 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.29-1
-- Update to 0.5.29
-
-* Wed Jul 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.28-1
-- Update to 0.5.28
-
-* Mon Jul 09 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.27-1
-- Update to 0.5.27
-
-* Mon Jun 18 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.26-1
-- Update to 0.5.26
-
-* Sat Apr 28 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.19-1
-- Update to 0.5.19
-
-* Mon Apr 02 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.17-1
-- Update to 0.5.17
-
-* Mon Mar 26 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.16-1
-- Update to 0.5.16
-- add ownership of /usr/share/nginx/html (#233950)
-
-* Fri Mar 23 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.15-3
-- fixed package review bugs (#235222) given by ruben at rubenkerkhof.com
-
-* Thu Mar 22 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.15-2
-- fixed package review bugs (#233522) given by kevin at tummy.com
-
-* Thu Mar 22 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.15-1
-- create patches to assist with building for Fedora
-- initial packaging for Fedora
More information about the scm-commits
mailing list