nginx:

- update to 0.8.35 (development version)
- add sites.d/ to store vitualhost settings
- split out default server settings to sites.d/default
- add fancyindex module



git-svn-id: http://trac.vinelinux.org/repos/projects/specs@854 ec354946-7b23-47d6-9f5a-488ba84defc7

n/nginx/nginx-vl.spec

@@ -2,6 +2,7 @@
 %define nginx_group     %{nginx_user}
 %define nginx_home      %{_localstatedir}/lib/nginx
 %define nginx_home_tmp  %{nginx_home}/tmp
+%define nginx_home_cache %{nginx_home}/cache
 %define nginx_logdir    %{_localstatedir}/log/nginx
 %define nginx_confdir   %{_sysconfdir}/nginx
 %define nginx_datadir   %{_datadir}/nginx
@@ -10,7 +11,7 @@
 Summary:        Robust, small and high performance http and reverse proxy server
 Summary(ja):    堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
 Name:           nginx
-Version:        0.7.63
+Version:        0.8.35
 Release:        1%{?_dist_release}
 
 Group:          System Environment/Daemons   
@@ -18,11 +19,36 @@ Group:          System Environment/Daemons
 # http://www.freebsd.org/copyright/freebsd-license.html
 License:        BSD
 URL:            http://nginx.net/ 
+
+Source0:    http://sysoev.ru/nginx/nginx-%{version}.tar.gz
+Source1:    %{name}.init
+Source2:    %{name}.logrotate
+Source3:    nginx-virtual.conf.template
+Source4:    nginx-ssl.conf
+Source5:    %{name}.sysconfig
+Source10:   nginx-vine.conf
+Source11:   nginx-default-vine
+Source20:   proxy_cache.conf
+Source100:  nginx-index.html
+Source101:  poweredby-vine.png
+Source102:  nginx-logo.png
+Source103:  nginx-50x.html
+Source104:  nginx-404.html
+Source1000: ngx-fancyindex-git.tar.bz2
+
+# 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
+# configuration patch to match all the Vine Linux paths for logs, pid files
+# etc.
+Patch1:     nginx-conf.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:      pcre-devel
 BuildRequires:      zlib-devel
 BuildRequires:      openssl-devel
+BuildRequires:	    gd-devel
 BuildRequires:      perl
 BuildRequires:      perl(ExtUtils::Embed)
 Requires:           pcre
@@ -40,25 +66,9 @@ Requires(post):     chkconfig
 Requires(preun):    chkconfig, initscripts
 Requires(postun):   initscripts
 
-Source0:    http://sysoev.ru/nginx/nginx-%{version}.tar.gz
-Source1:    %{name}.init
-Source2:    %{name}.logrotate
-Source3:    nginx-virtual.conf
-Source4:    nginx-ssl.conf
-Source5:    %{name}.sysconfig
-Source100:  nginx-index.html
-Source101:  poweredby-vine.png
-Source102:  nginx-logo.png
-Source103:  nginx-50x.html
-Source104:  nginx-404.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
-
-# configuration patch to match all the Vine Linux paths for logs, pid files
-# etc.
-Patch1:     nginx-conf.patch
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
 
 %description
 Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
@@ -72,7 +82,7 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
  - IMAP/POP3 プロキシサーバ
 
 %prep
-%setup -q
+%setup -q -a 1000
 
 %patch0 -p0
 %patch1 -p1
@@ -97,18 +107,31 @@ export DESTDIR=%{buildroot}
     --http-fastcgi-temp-path=%{nginx_home_tmp}/fastcgi \
     --pid-path=%{_localstatedir}/run/%{name}.pid \
     --lock-path=%{_localstatedir}/lock/subsys/%{name} \
+    --with-file-aio \
+    --with-ipv6 \
     --with-http_ssl_module \
     --with-http_realip_module \
     --with-http_addition_module \
+    --with-http_xslt_module \
+    --with-http_image_filter_module \
     --with-http_sub_module \
     --with-http_dav_module \
     --with-http_flv_module \
     --with-http_gzip_static_module \
+    --with-http_random_index_module \
+    --with-http_secure_link_module \
     --with-http_stub_status_module \
     --with-http_perl_module \
     --with-mail \
     --with-mail_ssl_module \
-    --with-cc-opt="%{optflags} $(pcre-config --cflags)" 
+    --add-module=ngx-fancyindex \
+%ifarch i686
+    --with-cpu-opt=pentiumpro \
+    --with-zlib-asm=pentiumpro \
+    --with-md5-asm \
+    --with-sha1-asm \
+%endif
+    --with-cc-opt="-O6 %{optflags} $(pcre-config --cflags)"
 make %{?_smp_mflags} 
 
 %install
@@ -124,8 +147,14 @@ chmod 0755 %{buildroot}%{_sbindir}/nginx
 %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -p -D -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
-%{__install} -p -m 0644 %{SOURCE3} %{buildroot}%{nginx_confdir}/conf.d/virtual.conf
+%{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/sites.d
+%{__install} -p -m 0644 %{SOURCE3} %{buildroot}%{nginx_confdir}/sites.d/virtual.conf.template
 %{__install} -p -m 0644 %{SOURCE4} %{buildroot}%{nginx_confdir}/conf.d/ssl.conf
+%{__install} -p -m 0644 %{SOURCE10} %{buildroot}%{nginx_confdir}/nginx.conf
+%{__install} -p -m 0644 %{SOURCE10} %{buildroot}%{nginx_confdir}/nginx.conf.default
+%{__install} -p -m 0644 %{SOURCE11} %{buildroot}%{nginx_confdir}/sites.d/default
+%{__install} -p -m 0644 %{SOURCE20} %{buildroot}%{nginx_confdir}/conf.d/proxy_cache.conf
+%{__install} -p -d -m 0755 %{buildroot}%{nginx_home_cache}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
 %{__install} -p -d -m 0755 %{buildroot}%{nginx_webroot}
@@ -135,6 +164,8 @@ chmod 0755 %{buildroot}%{_sbindir}/nginx
 %{__install} -p -m 0644 %{SOURCE103} %{buildroot}%{nginx_webroot}/50x.html
 %{__install} -p -m 0644 %{SOURCE104} %{buildroot}%{nginx_webroot}/404.html
 
+touch %{buildroot}%{nginx_confdir}/conf.d/virtual.conf
+
 # convert to UTF-8 all files that give warnings.
 for textfile in CHANGES
 do
@@ -177,6 +208,8 @@ fi
 %dir %{nginx_confdir}
 %dir %{nginx_confdir}/conf.d
 %config(noreplace) %{nginx_confdir}/conf.d/*.conf
+%ghost %config(noreplace) %{nginx_confdir}/conf.d/virtual.conf
+%config(noreplace) %{nginx_confdir}/sites.d/*
 %config(noreplace) %{nginx_confdir}/win-utf
 %config(noreplace) %{nginx_confdir}/%{name}.conf.default
 %config(noreplace) %{nginx_confdir}/mime.types.default
@@ -186,6 +219,8 @@ fi
 %config(noreplace) %{nginx_confdir}/koi-utf
 %config(noreplace) %{nginx_confdir}/%{name}.conf
 %config(noreplace) %{nginx_confdir}/mime.types
+%config(noreplace) %{nginx_confdir}/fastcgi.conf
+%config(noreplace) %{nginx_confdir}/fastcgi.conf.default
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %dir %{perl_vendorarch}/auto/%{name}
@@ -193,10 +228,17 @@ fi
 %{perl_vendorarch}/auto/%{name}/%{name}.so
 %attr(-,%{nginx_user},%{nginx_group}) %dir %{nginx_home}
 %attr(-,%{nginx_user},%{nginx_group}) %dir %{nginx_home_tmp}
+%attr(-,%{nginx_user},%{nginx_group}) %dir %{nginx_home_cache}
 %attr(-,%{nginx_user},%{nginx_group}) %dir %{nginx_logdir}
 
 
 %changelog
+* Sat Apr 17 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.35-1
+- update to 0.8.35 (development version)
+- add sites.d/ to store vitualhost settings
+- split out default server settings to sites.d/default
+- add fancyindex module
+
 * Wed Dec 04 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.7.63-1
 - new upstream release