SPECS (DEVEL): lighttpd.spec - configs for proxy ajp13 and http backends - ...

[glen]

Author: glen                         Date: Mon Jan 19 10:58:06 2009 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- configs for proxy ajp13 and http backends
- mod_proxy is now virtual for smooth upgrade

---- Files affected:
SPECS:
   lighttpd.spec (1.201.2.17 -> 1.201.2.18) 

---- Diffs:

================================================================
Index: SPECS/lighttpd.spec
diff -u SPECS/lighttpd.spec:1.201.2.17 SPECS/lighttpd.spec:1.201.2.18
--- SPECS/lighttpd.spec:1.201.2.17	Mon Jan 19 11:49:28 2009
+++ SPECS/lighttpd.spec	Mon Jan 19 11:58:00 2009
@@ -48,7 +48,7 @@
 %define		webdav_progs	1
 %endif
 
-%define		rel 0.3
+%define		rel 0.5
 Summary:	Fast and light HTTP server
 Summary(pl.UTF-8):	Szybki i lekki serwer HTTP
 Name:		lighttpd
@@ -88,7 +88,6 @@
 Source111:	%{name}-mod_expire.conf
 Source113:	%{name}-mod_flv_streaming.conf
 Source114:	%{name}-mod_indexfile.conf
-Source115:	%{name}-mod_proxy.conf
 Source116:	%{name}-mod_redirect.conf
 Source117:	%{name}-mod_rewrite.conf
 Source118:	%{name}-mod_rrdtool.conf
@@ -112,6 +111,8 @@
 Source136:	%{name}-mod_uploadprogress.conf
 Source137:	%{name}-mod_proxy_core.conf
 Source138:	%{name}-mod_proxy_backend_fastcgi.conf
+Source139:	%{name}-mod_proxy_backend_ajp13.conf
+Source140:	%{name}-mod_proxy_backend_http.conf
 #Patch100: %{name}-branch.diff
 Patch0:		%{name}-use_bin_sh.patch
 #Patch1: %{name}-mod_evasive-status_code.patch
@@ -444,15 +445,10 @@
 Summary:	lighttpd module for proxying requests
 Summary(pl.UTF-8):	Moduł lighttpd do przekazywania żądań
 Group:		Networking/Daemons
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-mod_proxy_core = %{version}-%{release}
 
 %description mod_proxy
-The proxy module a simplest way to connect lighttpd to Java servers
-which have a HTTP-interface.
-
-%description mod_proxy -l pl.UTF-8
-Moduł proxy to najprostszy sposób łączenia lighttpd z serwerami Javy
-mającymi interfejs HTTP.
+Virtual package supporting upgrade from Lighttpd 1.4.x -> 1.5.0.
 
 %package mod_proxy_core
 Summary:	lighttpd module for proxying requests
@@ -891,9 +887,10 @@
 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 %{SOURCE115} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy.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 %{SOURCE120} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_secdownload.conf
@@ -1010,7 +1007,6 @@
 %module_scripts mod_indexfile
 %module_scripts mod_magnet
 %module_scripts mod_mysql_vhost
-%module_scripts mod_proxy
 %module_scripts mod_proxy_core
 %module_scripts mod_proxy_backend_fastcgi
 %module_scripts mod_proxy_backend_scgi
@@ -1182,12 +1178,8 @@
 %attr(755,root,root) %{_libdir}/mod_sql_vhost_core.so
 %endif
 
-%if 0
 %files mod_proxy
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_proxy.conf
-%attr(755,root,root) %{_libdir}/mod_proxy.so
-%endif
 
 %files mod_proxy_core
 %defattr(644,root,root,755)
@@ -1196,6 +1188,7 @@
 
 %files mod_proxy_backend_ajp13
 %defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_proxy_backend_ajp13.conf
 %attr(755,root,root) %{_libdir}/mod_proxy_backend_ajp13.so
 
 %files mod_proxy_backend_fastcgi
@@ -1205,6 +1198,7 @@
 
 %files mod_proxy_backend_http
 %defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_proxy_backend_http.conf
 %attr(755,root,root) %{_libdir}/mod_proxy_backend_http.so
 
 %files mod_proxy_backend_scgi
@@ -1310,6 +1304,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.201.2.18  2009/01/19 10:58:00  glen
+- configs for proxy ajp13 and http backends
+- mod_proxy is now virtual for smooth upgrade
+
 Revision 1.201.2.17  2009/01/19 10:49:28  glen
 - mod_fastcgi, mod_scgi dropped in favour of mod_proxy_backend_* packages
 
================================================================

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