SPECS (DEVEL): lighttpd.spec - priorities for proxy backends, start basic c...

[glen]

Author: glen                         Date: Mon Jan 19 11:22:19 2009 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- priorities for proxy backends, start basic converter

---- Files affected:
SPECS:
   lighttpd.spec (1.201.2.19 -> 1.201.2.20) 

---- Diffs:

================================================================
Index: SPECS/lighttpd.spec
diff -u SPECS/lighttpd.spec:1.201.2.19 SPECS/lighttpd.spec:1.201.2.20
--- SPECS/lighttpd.spec:1.201.2.19	Mon Jan 19 12:04:35 2009
+++ SPECS/lighttpd.spec	Mon Jan 19 12:22:14 2009
@@ -48,7 +48,7 @@
 %define		webdav_progs	1
 %endif
 
-%define		rel 0.6
+%define		rel 0.8
 Summary:	Fast and light HTTP server
 Summary(pl.UTF-8):	Szybki i lekki serwer HTTP
 Name:		lighttpd
@@ -447,6 +447,7 @@
 Summary:	lighttpd module for proxying requests
 Summary(pl.UTF-8):	Moduł lighttpd do przekazywania żądań
 Group:		Networking/Daemons/HTTP
+Requires:	%{name}-mod_proxy_backend_http = %{version}-%{release}
 Requires:	%{name}-mod_proxy_core = %{version}-%{release}
 
 %description mod_proxy
@@ -813,6 +814,15 @@
 
 # build mime.types.conf
 sh %{SOURCE6} /etc/mime.types
+cat <<'EOF' > doc/convert-1.5.sh
+#!/bin/sh
+# converts 1.4 directives to 1.5 format, the ones that are simple
+sed -i -e '
+	s/proxy\.balance\s*=\s*fair/proxy-core.balancer = sqf/
+	s/proxy\.balance\s*=\s*hash/proxy-core.balancer = carp/
+	s/proxy\.balance\s*=\s*/proxy-core.balancer = /
+' "$@"
+EOF
 
 %build
 %{__libtoolize}
@@ -889,12 +899,12 @@
 install %{SOURCE113} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_flv_streaming.conf
 install %{SOURCE114} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_indexfile.conf
 install %{SOURCE134} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_magnet.conf
-install %{SOURCE137} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy_core.conf
-install %{SOURCE138} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy_backend_fastcgi.conf
-install %{SOURCE139} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy_backend_ajp13.conf
-install %{SOURCE140} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy_backend_http.conf
 install %{SOURCE118} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_rrdtool.conf
-install %{SOURCE119} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy_backend_scgi.conf
+install %{SOURCE137} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy_core.conf
+install %{SOURCE138} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_proxy_backend_fastcgi.conf
+install %{SOURCE139} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_proxy_backend_ajp13.conf
+install %{SOURCE140} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_proxy_backend_http.conf
+install %{SOURCE119} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_proxy_backend_scgi.conf
 install %{SOURCE120} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_secdownload.conf
 install %{SOURCE121} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_setenv.conf
 install %{SOURCE122} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_simple_vhost.conf
@@ -1049,7 +1059,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README ChangeLog doc/lighttpd.conf doc/*.txt doc/rrdtool-graph.sh
+%doc NEWS README ChangeLog doc/lighttpd.conf doc/*.txt doc/rrdtool-graph.sh doc/convert-1.5.sh
 %dir %attr(750,root,lighttpd) %{_sysconfdir}
 %dir %attr(750,root,root) %{_sysconfdir}/webapps.d
 %dir %attr(750,root,root) %{_sysconfdir}/conf.d
@@ -1306,6 +1316,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.201.2.20  2009/01/19 11:22:14  glen
+- priorities for proxy backends, start basic converter
+
 Revision 1.201.2.19  2009/01/19 11:04:35  glen
 - remoev duplicate monitrc packaging
 - move fcgi-stat-accell to proxy fcgi backend package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lighttpd.spec?r1=1.201.2.19&r2=1.201.2.20&f=u