lighttpd:

- update to 1.4.31
- build with pcre-8.31
- require www-common, change docroot owner to www-data

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7002 ec354946-7b23-47d6-9f5a-488ba84defc7

l/lighttpd/lighttpd-vl.spec

@@ -3,12 +3,12 @@
 Summary: Lightning fast webserver with light system requirements
 Summary(ja): 少ないシステムリソースで動く超高速なウェブサーバ
 Name: lighttpd
-Version: 1.4.22
-Release: 2%{?_dist_release}
+Version: 1.4.31
+Release: 1%{?_dist_release}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
-Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.bz2
+Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.xz
 Source1: lighttpd.logrotate
 Source2: php.d-lighttpd.ini
 Source3: lighttpd.init
@@ -16,9 +16,10 @@ Source10: index.html
 Source11: http://www.lighttpd.net/favicon.ico
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
-Patch0: lighttpd-1.4.20-defaultconf.patch
+Patch0: lighttpd-1.4.31-vine.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): shadow-utils
+Requires(pre): www-common
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(postun): chkconfig
@@ -54,6 +55,7 @@ Virtual host module for lighttpd that uses a MySQL database.
 Summary: FastCGI module and spawning helper for lighttpd and PHP configuration
 Group: System Environment/Daemons
 Requires: %{name} = %{version}
+Requires: spawn-fcgi
 
 %description fastcgi
 This package contains the spawn-fcgi helper for lighttpd's automatic spawning
@@ -66,7 +68,7 @@ recompile PHP yourself.
 
 %prep
 %setup -q
-%patch0 -p1 -b .defaultconf
+%patch0 -p1 -b .vine
 
 
 %build
@@ -77,6 +79,7 @@ recompile PHP yourself.
     --with-openssl \
     --with-fam \
     --with-gdbm \
+    --with-pcre \
     %{?_with_memcache:--with-memcache} \
     %{?_with_webdavprops:--with-webdav-props} \
     %{?_with_webdavlocks:--with-webdav-locks} \
@@ -89,14 +92,23 @@ recompile PHP yourself.
 %{__make} install DESTDIR=%{buildroot}
 
 # Install included init script and sysconfig entry
-%{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \
+%{__install} -D -p -m 0755 doc/initscripts/rc.lighttpd.redhat \
     %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd
-%{__install} -D -p -m 0644 doc/sysconfig.lighttpd \
+%{__install} -D -p -m 0644 doc/initscripts/sysconfig.lighttpd \
     %{buildroot}%{_sysconfdir}/sysconfig/lighttpd
 
 # Install (*patched above*) sample config file
-%{__install} -D -p -m 0640 doc/lighttpd.conf \
+%{__install} -D -p -m 0640 doc/config/lighttpd.conf \
     %{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf
+%{__install} -D -p -m 0640 doc/config/modules.conf \
+    %{buildroot}%{_sysconfdir}/lighttpd/modules.conf
+
+mkdir -p %{buildroot}%{_sysconfdir}/lighttpd/conf.d/
+%{__install} -D -p -m 0640 doc/config/conf.d/*.conf \
+    %{buildroot}%{_sysconfdir}/lighttpd/conf.d/
+mkdir -p %{buildroot}%{_sysconfdir}/lighttpd/vhosts.d/
+%{__install} -D -p -m 0640 doc/config/vhosts.d/vhosts.template \
+    %{buildroot}%{_sysconfdir}/lighttpd/vhosts.d/
 
 # Install our own logrotate entry
 %{__install} -D -p -m 0644 %{SOURCE1} \
@@ -127,10 +139,6 @@ recompile PHP yourself.
 %{__rm} -rf %{buildroot}
 
 
-%pre
-/usr/sbin/useradd -s /sbin/nologin -M -r -d %{webroot} \
-    -c "lighttpd web server" lighttpd &>/dev/null || :
-
 %post
 /sbin/chkconfig --add lighttpd
 
@@ -148,10 +156,12 @@ fi
 
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog COPYING README
-%doc doc/*.txt doc/lighttpd.conf doc/lighttpd.user
+%doc AUTHORS NEWS COPYING README
+%doc doc/config/lighttpd.conf
 %dir %{_sysconfdir}/lighttpd/
 %config(noreplace) %{_sysconfdir}/lighttpd/lighttpd.conf
+%config(noreplace) %{_sysconfdir}/lighttpd/conf.d/*
+%config(noreplace) %{_sysconfdir}/lighttpd/vhosts.d/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/lighttpd
 %config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
 %{_sysconfdir}/rc.d/init.d/lighttpd
@@ -161,27 +171,33 @@ fi
 %exclude %{_libdir}/lighttpd/*.la
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
-%{_mandir}/man1/lighttpd.1*
-%attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
+%exclude %{_sysconfdir}/lighttpd/conf.d/fastcgi.conf
+%exclude %{_sysconfdir}/lighttpd/conf.d/mysql_vhost.conf
+%{_mandir}/man8/lighttpd.8*
+%attr(0750, www-data, www-data) %{_var}/log/lighttpd/
 %{webroot}/
 
 %files mod_mysql_vhost
 %defattr(-, root, root, 0755)
 %doc doc/mysqlvhost.txt
 %dir %{_libdir}/lighttpd/
+%{_sysconfdir}/lighttpd/conf.d/mysql_vhost.conf
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
 %files fastcgi
 %defattr(-, root, root, 0755)
-%doc doc/fastcgi*.txt
 %config(noreplace) %{_sysconfdir}/php.d/lighttpd.ini
-%{_bindir}/spawn-fcgi
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_fastcgi.so
-%{_mandir}/man1/spawn-fcgi.1*
+%{_sysconfdir}/lighttpd/conf.d/fastcgi.conf
 
 
 %changelog
+* Wed Oct 24 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.4.31-1
+- update to 1.4.31
+- build with pcre-8.31
+- require www-common, change docroot owner to www-data
+
 * Sun Feb 06 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.22-2
 - rebuild with openssl-1.0.0c