packages (DEVEL): lighttpd/lighttpd.spec - add webapps.d, update suggests, ...

[glen]

Author: glen                         Date: Sun Jan 15 12:28:40 2012 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- add webapps.d, update suggests, provides, webroot files

---- Files affected:
packages/lighttpd:
   lighttpd.spec (1.201.2.27 -> 1.201.2.28) 

---- Diffs:

================================================================
Index: packages/lighttpd/lighttpd.spec
diff -u packages/lighttpd/lighttpd.spec:1.201.2.27 packages/lighttpd/lighttpd.spec:1.201.2.28
--- packages/lighttpd/lighttpd.spec:1.201.2.27	Thu Jan  5 19:35:48 2012
+++ packages/lighttpd/lighttpd.spec	Sun Jan 15 13:28:34 2012
@@ -50,7 +50,7 @@
 %define		webdav_progs	1
 %endif
 
-%define		rel 0.9
+%define		rel 0.10
 Summary:	Fast and light HTTP server
 Summary(pl.UTF-8):	Szybki i lekki serwer HTTP
 Name:		lighttpd
@@ -58,7 +58,7 @@
 Release:	%{rel}%{?snap:.%(echo %{snap}|tr - _)}%{?svn:.%{svn}}
 License:	BSD
 Group:		Networking/Daemons/HTTP
-Source0:	lighttpd-r%{svn}.tar.bz2
+Source0:	%{name}-r%{svn}.tar.bz2
 # Source0-md5:	f3d639579cc10841a995334a1394382c
 Source1:	%{name}.init
 Source2:	%{name}.conf
@@ -162,7 +162,7 @@
 Requires:	libaio
 Requires:	rc-scripts
 Requires:	rpm-whiteout >= 1.5
-Requires:	webapps
+Suggests:	%{name}-mod_accesslog
 Provides:	group(http)
 Provides:	group(lighttpd)
 Provides:	user(lighttpd)
@@ -780,6 +780,7 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-mod_proxy_backend_fastcgi = %{version}-%{release}
 Requires:	php-fcgi
+Provides:	webserver(php)
 Obsoletes:	lighttpd-php-external
 
 %description php-spawned
@@ -794,7 +795,8 @@
 Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-mod_proxy_backend_fastcgi = %{version}-%{release}
-Requires:	php-fcgi-init
+Suggests:	php-fcgi-init
+Suggests:	php-fpm
 Obsoletes:	lighttpd-php-spawned
 
 %description php-external
@@ -877,7 +879,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_lighttpddir}/{cgi-bin,html},/etc/{logrotate.d,rc.d/init.d,sysconfig,init,monit}} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/{conf,webapps}.d \
+	$RPM_BUILD_ROOT%{_sysconfdir}/{conf,vhosts,webapps}.d \
 	$RPM_BUILD_ROOT{/var/log/{%{name},archive/%{name}},/var/run/%{name}} \
 	$RPM_BUILD_ROOT%{_datadir}/lighttpd/errordocs \
 	$RPM_BUILD_ROOT/var/lib/lighttpd \
@@ -1078,8 +1080,9 @@
 %defattr(644,root,root,755)
 %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
+%dir %attr(750,root,root) %{_sysconfdir}/vhosts.d
+%dir %attr(750,root,root) %{_sysconfdir}/webapps.d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.types.conf
 %attr(640,root,lighttpd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.user
@@ -1097,11 +1100,13 @@
 %attr(755,root,root) %{_sbindir}/lighttpd
 %dir %{_libdir}
 %attr(755,root,root) %{_libdir}/mod_chunked.so
-%{_mandir}/man?/*
+%{_mandir}/man8/lighttpd.8*
 %dir %{_lighttpddir}
 %dir %{_lighttpddir}/cgi-bin
 %dir %{_lighttpddir}/html
-%config(noreplace,missingok) %verify(not md5 mtime size) %{_lighttpddir}/html/*
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_lighttpddir}/html/index.html
+%config(missingok) %verify(not md5 mtime size) %{_lighttpddir}/html/*.png
+%config(missingok) %verify(not md5 mtime size) %{_lighttpddir}/html/*.ico
 
 %dir %{_datadir}/lighttpd
 %dir %{_datadir}/lighttpd/errordocs
@@ -1330,6 +1335,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.201.2.28  2012/01/15 12:28:34  glen
+- add webapps.d, update suggests, provides, webroot files
+
 Revision 1.201.2.27  2012/01/05 18:35:48  glen
 - add breakage.log
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd.spec?r1=1.201.2.27&r2=1.201.2.28&f=u