rpms/nginx/EL-4 .cvsignore, 1.15, 1.16 nginx-conf.patch, 1.1, 1.2 nginx.spec, 1.19, 1.20 sources, 1.15, 1.16 nginx-auto-install.patch, 1.1, NONE nginx-auto-options.patch, 1.1, NONE

[jjh]

Author: jjh

Update of /cvs/pkgs/rpms/nginx/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25103

Modified Files:
	.cvsignore nginx-conf.patch nginx.spec sources 
Removed Files:
	nginx-auto-install.patch nginx-auto-options.patch 
Log Message:
update to 0.6.38, 0.5.x is deprecated


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	27 Jul 2008 15:54:24 -0000	1.15
+++ .cvsignore	3 Aug 2009 02:29:26 -0000	1.16
@@ -1 +1 @@
-nginx-0.5.37.tar.gz
+nginx-0.6.38.tar.gz

nginx-conf.patch:
 nginx.conf |   24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

Index: nginx-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-4/nginx-conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nginx-conf.patch	24 Mar 2007 18:31:48 -0000	1.1
+++ nginx-conf.patch	3 Aug 2009 02:29:26 -0000	1.2
@@ -1,5 +1,6 @@
---- conf/nginx.conf.orig	2007-03-22 22:44:23.000000000 -0600
-+++ conf/nginx.conf	2007-03-22 23:06:48.000000000 -0600
+diff -up conf/nginx.conf.orig conf/nginx.conf
+--- conf/nginx.conf.orig	2008-02-28 13:44:16.000000000 -0700
++++ conf/nginx.conf	2009-08-02 20:21:53.000000000 -0600
 @@ -1,12 +1,11 @@
 -
 -#user  nobody;
@@ -18,11 +19,11 @@
  
  
  events {
-@@ -15,14 +14,14 @@
+@@ -15,14 +14,14 @@ events {
  
  
  http {
--    include       conf/mime.types;
+-    include       mime.types;
 +    include       /etc/nginx/mime.types;
      default_type  application/octet-stream;
  
@@ -34,11 +35,11 @@
 +                      '"$http_user_agent" "$http_x_forwarded_for"';
  
 -    #access_log  logs/access.log  main;
-+    access_log  /var/log/nginx/access.log  main;
++    access_log  /var/log/nginx/logs/access.log  main;
  
      sendfile        on;
      #tcp_nopush     on;
-@@ -38,7 +37,7 @@
+@@ -38,7 +37,7 @@ http {
  
          #charset koi8-r;
  
@@ -47,7 +48,7 @@
  
          location / {
              root   html;
-@@ -113,5 +112,4 @@
+@@ -114,5 +113,4 @@ http {
      #        index  index.html index.htm;
      #    }
      #}


Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-4/nginx.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- nginx.spec	27 Jul 2008 15:54:24 -0000	1.19
+++ nginx.spec	3 Aug 2009 02:29:26 -0000	1.20
@@ -7,7 +7,7 @@
 %define nginx_datadir   %{_datadir}/nginx
 
 Name:           nginx
-Version:        0.5.37
+Version:        0.6.38
 Release:        1%{?dist}
 Summary:        Robust, small and high performance http and reverse proxy server
 Group:          System Environment/Daemons   
@@ -33,14 +33,9 @@ Source2:    %{name}.logrotate
 # -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.
-Patch1:     nginx-auto-install.patch
-Patch2:     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
@@ -51,8 +46,6 @@ proxy server written by Igor Sysoev.
 
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
-%patch3 -p0
 
 %build
 # nginx does not utilize a standard configure script.  It has its own
@@ -157,6 +150,10 @@ fi
 
 
 %changelog
+* Sun Aug 02 2009 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.38-1
+- 0.5.x branch is no longer in support, updating to newest legacy stable 0.6.38
+- remove unneeded patches
+
 * Sun Jul 27 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.37-1
 update to 0.5.37
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/EL-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	27 Jul 2008 15:54:24 -0000	1.15
+++ sources	3 Aug 2009 02:29:26 -0000	1.16
@@ -1 +1 @@
-055ebcdf71a00177b4ee1ac71fa6b82c  nginx-0.5.37.tar.gz
+58f35e44b695d1013add16ab45beb410  nginx-0.6.38.tar.gz


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


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