SPECS (DEVEL): lighttpd.spec - created -php-spawned and -php-exter...

[glen]

Author: glen                         Date: Mon Jul 17 16:22:12 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- created -php-spawned and -php-external packages
- webserver(virtual) provides renamed to be shorter and less confusing

---- Files affected:
SPECS:
   lighttpd.spec (1.154.2.11 -> 1.154.2.12) 

---- Diffs:

================================================================
Index: SPECS/lighttpd.spec
diff -u SPECS/lighttpd.spec:1.154.2.11 SPECS/lighttpd.spec:1.154.2.12
--- SPECS/lighttpd.spec:1.154.2.11	Tue Jul 11 22:42:04 2006
+++ SPECS/lighttpd.spec	Mon Jul 17 18:22:07 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.15
+%define		_rel 3.23
 # svn snapshot
-%define		_svn	1154
+%define		_svn	1173
 
 Summary:	Fast and light HTTP server
 Summary(pl):	Szybki i lekki serwer HTTP
@@ -84,6 +84,8 @@
 Source127:	%{name}-mod_userdir.conf
 Source128:	%{name}-mod_usertrack.conf
 Source129:	%{name}-mod_webdav.conf
+Source130:	%{name}-php-spawned.conf
+Source131:	%{name}-php-external.conf
 Patch100:	%{name}-branch.diff
 Patch0:		%{name}-mod_deflate.patch
 Patch1:		%{name}-use_bin_sh.patch
@@ -158,7 +160,7 @@
 Group:		Networking/Daemons
 URL:		http://www.lighttpd.net/documentation/access.html
 Requires:	%{name} = %{version}-%{release}
-Provides:	webserver(url_access)
+Provides:	webserver(access)
 
 %description mod_access
 The access module is used to deny access to files with given trailing
@@ -178,7 +180,7 @@
 Group:		Networking/Daemons
 URL:		http://www.lighttpd.net/documentation/alias.html
 Requires:	%{name} = %{version}-%{release}
-Provides:	webserver(url_alias)
+Provides:	webserver(alias)
 
 %description mod_alias
 The alias module is used to specify a special document-root for a
@@ -189,7 +191,7 @@
 Group:		Networking/Daemons
 URL:		http://www.lighttpd.net/documentation/authentication.html
 Requires:	%{name} = %{version}-%{release}
-Provides:	webserver(authentication)
+Provides:	webserver(auth)
 
 %description mod_auth
 lighttpd supportes both authentication method described by RFC 2617:
@@ -200,6 +202,7 @@
 Group:		Networking/Daemons
 URL:		http://www.lighttpd.net/documentation/cgi.html
 Requires:	%{name} = %{version}-%{release}
+Provides:	webserver(cgi)
 
 %description mod_cgi
 The cgi module provides a CGI-conforming interface.
@@ -527,6 +530,28 @@
 spawn-fcgi służy do uruchamiania procesów fcgi bezpośrednio, bez
 pomocy serwera WWW ani samego programu.
 
+%package php-spawned
+Summary:	PHP support via FastCGI, spawned by lighttpd
+Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-mod_fastcgi = %{version}-%{release}
+Requires:	php-fcgi
+Obsoletes:	lighttpd-php-external
+
+%description php-spawned
+PHP support via FastCGI, spawned by lighttpd
+
+%package php-external
+Summary:	PHP support via FastCGI, spawning controlled externally
+Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-mod_fastcgi = %{version}-%{release}
+Requires:	php-fcgi-init
+Obsoletes:	lighttpd-php-spawned
+
+%description php-external
+PHP support via FastCGI, spawning controlled externally
+
 %prep
 %setup -q
 %patch100 -p1
@@ -623,6 +648,9 @@
 
 install %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_accesslog.conf
 
+install %{SOURCE130} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-spawned.conf
+install %{SOURCE131} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-external.conf
+
 %if %{without mysql}
 # avoid packaging dummy module
 rm -f $RPM_BUILD_ROOT%{_libdir}/mod_mysql_vhost.so
@@ -716,6 +744,8 @@
 %module_scripts mod_userdir
 %module_scripts mod_usertrack
 %module_scripts mod_webdav
+%module_scripts php-spawned
+%module_scripts php-external
 
 %triggerpostun -- %{name} <= 1.3.6-2
 %banner %{name} -e <<EOF
@@ -909,12 +939,24 @@
 %doc doc/spawn-php.sh
 %attr(755,root,root) %{_sbindir}/spawn-fcgi
 
+%files php-spawned
+%defattr(644,root,root,755)
+%{_sysconfdir}/conf.d/php-spawned.conf
+
+%files php-external
+%defattr(644,root,root,755)
+%{_sysconfdir}/conf.d/php-external.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.12  2006/07/17 16:22:07  glen
+- created -php-spawned and -php-external packages
+- webserver(virtual) provides renamed to be shorter and less confusing
+
 Revision 1.154.2.11  2006/07/11 20:42:04  glen
 - initial webserver(virtual) provides
 
================================================================

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