SPECS (DEVEL): lighttpd.spec - up to svn 1199 - added -ssl package...

[glen]

Author: glen                         Date: Tue Jul 18 10:20:02 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- up to svn 1199
- added -ssl package
- added mod_proxy_core package
- put mod_sql_vhost_core into mod_mysql_vhost package for now
- cleanups

---- Files affected:
SPECS:
   lighttpd.spec (1.154.2.13 -> 1.154.2.14) 

---- Diffs:

================================================================
Index: SPECS/lighttpd.spec
diff -u SPECS/lighttpd.spec:1.154.2.13 SPECS/lighttpd.spec:1.154.2.14
--- SPECS/lighttpd.spec:1.154.2.13	Mon Jul 17 18:26:30 2006
+++ SPECS/lighttpd.spec	Tue Jul 18 12:19:57 2006
@@ -26,9 +26,9 @@
 %bcond_with	valgrind	# compile code with valgrind support.
 %bcond_with	deflate		# build deflate module (needs patch update with current svn)
 
-%define		_rel 3.24
+%define		_rel 3.29
 # svn snapshot
-%define		_svn	1173
+%define		_svn	1199
 
 Summary:	Fast and light HTTP server
 Summary(pl):	Szybki i lekki serwer HTTP
@@ -86,6 +86,8 @@
 Source129:	%{name}-mod_webdav.conf
 Source130:	%{name}-php-spawned.conf
 Source131:	%{name}-php-external.conf
+Source132:	%{name}-ssl.conf
+Source133:	%{name}-mod_proxy_core.conf
 Patch100:	%{name}-branch.diff
 Patch0:		%{name}-mod_deflate.patch
 Patch1:		%{name}-use_bin_sh.patch
@@ -351,6 +353,18 @@
 The proxy module a simplest way to connect lighttpd to java servers
 which have a HTTP-interface.
 
+%package mod_proxy_core
+Summary:	lighttpd module for proxying requests
+Group:		Networking/Daemons
+URL:		http://blog.lighttpd.net/articles/2006/07/18/mod_proxy_core-commited-to-svn
+Requires:	%{name} = %{version}-%{release}
+
+%description mod_proxy_core
+The proxy module a simplest way to connect lighttpd to java servers
+which have a HTTP-interface.
+
+This is the new proxy code.
+
 %package mod_redirect
 Summary:	lighttpd module for URL redirects
 Group:		Networking/Daemons
@@ -552,6 +566,15 @@
 %description php-external
 PHP support via FastCGI, spawning controlled externally
 
+%package ssl
+Summary:	lighttpd support for SSLv2 and SSLv3
+Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
+URL:		http://www.lighttpd.net/documentation/ssl.html
+
+%description ssl
+lighttpd support for SSLv2 and SSLv3.
+
 %prep
 %setup -q
 %patch100 -p1
@@ -633,6 +656,7 @@
 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 %{SOURCE115} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy.conf
+install %{SOURCE133} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy_core.conf
 install %{SOURCE118} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_rrdtool.conf
 install %{SOURCE119} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_scgi.conf
 install %{SOURCE120} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_secdownload.conf
@@ -650,12 +674,17 @@
 
 install %{SOURCE130} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-spawned.conf
 install %{SOURCE131} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-external.conf
+install %{SOURCE132} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/ssl.conf
 
 %if %{without mysql}
 # avoid packaging dummy module
 rm -f $RPM_BUILD_ROOT%{_libdir}/mod_mysql_vhost.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/mod_sql_vhost_core.so
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_mysql_vhost.conf
 %endif
+%if %{without deflate}
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_deflate.conf
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -858,6 +887,7 @@
 %files mod_mysql_vhost
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_mysql_vhost.conf
+%attr(755,root,root) %{_libdir}/mod_sql_vhost_core.so
 %attr(755,root,root) %{_libdir}/mod_mysql_vhost.so
 %endif
 
@@ -866,6 +896,11 @@
 %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
 
+%files mod_proxy_core
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_proxy_core.conf
+%attr(755,root,root) %{_libdir}/mod_proxy_core.so
+
 %files mod_redirect
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_redirect.conf
@@ -949,12 +984,23 @@
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/php-external.conf
 
+%files ssl
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ssl.conf
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.154.2.14  2006/07/18 10:19:57  glen
+- up to svn 1199
+- added -ssl package
+- added mod_proxy_core package
+- put mod_sql_vhost_core into mod_mysql_vhost package for now
+- cleanups
+
 Revision 1.154.2.13  2006/07/17 16:26:30  glen
 - %verify for config files
 - fix broken mod_trigger_b4_dl module package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/lighttpd.spec?r1=1.154.2.13&r2=1.154.2.14&f=u