rpms/nginx/EL-5 .cvsignore, 1.11, 1.12 nginx.spec, 1.16, 1.17 sources, 1.12, 1.13 nginx-auto-install.patch, 1.2, NONE nginx-auto-options.patch, 1.1, NONE

[Jeremy Hinegardner (jjh)]

Author: jjh

Update of /cvs/pkgs/rpms/nginx/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14820

Modified Files:
	.cvsignore nginx.spec sources 
Removed Files:
	nginx-auto-install.patch nginx-auto-options.patch 
Log Message:
update to 0.6.32


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 May 2008 06:24:45 -0000	1.11
+++ .cvsignore	27 Jul 2008 15:47:37 -0000	1.12
@@ -1 +1 @@
-nginx-0.6.31.tar.gz
+nginx-0.6.32.tar.gz


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/nginx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nginx.spec	27 May 2008 04:41:07 -0000	1.16
+++ nginx.spec	27 Jul 2008 15:47:37 -0000	1.17
@@ -8,8 +8,8 @@
 %define nginx_webroot   %{nginx_datadir}/html
 
 Name:           nginx
-Version:        0.6.31
-Release:        3%{?dist}
+Version:        0.6.32
+Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
 
@@ -22,7 +22,7 @@
 BuildRequires:      pcre-devel,zlib-devel,openssl-devel,perl(ExtUtils::Embed)
 Requires:           pcre,zlib,openssl
 Requires:           perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-# for /user/sbin/useradd
+# for /usr/sbin/useradd
 Requires(pre):      shadow-utils
 Requires(post):     chkconfig
 # for /sbin/service
@@ -47,28 +47,21 @@
 # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
 Patch0:     nginx-auto-cc-gcc.patch
 
-# nginx has its own configure/build scripts.  These patches allow nginx
-# to install into a buildroot.
-Patch2:     nginx-auto-install.patch
-Patch1:     nginx-auto-options.patch
-
 # configuration patch to match all the Fedora paths for logs, pid files
 # etc.
-Patch3:     nginx-conf.patch
+Patch1:     nginx-conf.patch
 
 %description
 Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
 proxy server written by Igor Sysoev.
 
-One third party module, nginx-upstream-fair has been added.
+One third party module, nginx-upstream-fair, has been added.
 
 %prep
 %setup -q
 
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
-%patch3 -p0
 %{__tar} zxvf %{SOURCE5}
 
 %build
@@ -104,7 +97,6 @@
     --with-mail_ssl_module \
     --with-cc-opt="%{optflags} $(pcre-config --cflags)" \
     --add-module=%{_builddir}/nginx-%{version}/nginx-upstream-fair
-
 make %{?_smp_mflags} 
 
 # rename the readme for nginx-upstream-fair so it doesn't conflict with the main
@@ -189,6 +181,10 @@
 
 
 %changelog
+* Sun Jul 27 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
 - update init script
 - remove 'default' listen parameter


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 May 2008 06:24:45 -0000	1.12
+++ sources	27 Jul 2008 15:47:37 -0000	1.13
@@ -1 +1 @@
-824bcc25bbd5b636f182237b69227bd2  nginx-0.6.31.tar.gz
+c09a2ace3c91f45dabbb608b11e48ed1  nginx-0.6.32.tar.gz


--- nginx-auto-install.patch DELETED ---


--- nginx-auto-options.patch DELETED ---