- exclude configure.ac from branch.diff to avoid version bump; rel 7

[packages/lighttpd.git] / lighttpd.spec

diff --git a/lighttpd.spec b/lighttpd.spec
index dbee84d2edcbd6f4eadb9056b9fd6dba90028dd2..4e23cfad8939505cf4ac85f0a11577909a651fc8 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -1,16 +1,3 @@
-# TODO:
-# - test mysql (failed at this time)
-# - mysql issue: http://www.freebsd.org/cgi/query-pr.cgi?pr=76866
-# - fam over gamin is possible, just configure doesn't check other than gamin
-# - feature stat-cache-fam (doesn't work)
-# - lighttpd writes early startup messages to stderr, and if started from
-#   rc-scripts the stderr is closed which causes lighttpd to abort():
-#   2006-07-20 21:05:52: (server.c.1233) WARNING: unknown config-key: url.rewrite-final (ignored)
-#
-# NOTES:
-# - disable largefile, if you have 2.4 kernel to get sendfile() support, and don't need > 2GB file requests,
-#   see http://article.gmane.org/gmane.comp.web.lighttpd:722
-#
 # Conditional build for lighttpd:
 %bcond_without xattr           # support of extended attributes
 %bcond_without ipv6            # IPv4-only version (doesn't require IPv6 in kernel)
@@ -35,12 +22,12 @@
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
-Version:       1.4.22
+Version:       1.4.23
 Release:       7
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2
-# Source0-md5: ed4ca3897eadf419c893b03fee53c982
+# Source0-md5: 0ab6bb7b17bf0f515ce7dce68e5e215a
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user
@@ -103,7 +90,6 @@ Patch2:              %{name}-mod_h264_streaming.patch
 Patch3:                %{name}-branding.patch
 Patch4:                %{name}-modinit-before-fork.patch
 Patch5:                %{name}-mod_deflate.patch
-Patch6:                %{name}-bug-1836.patch
 #Patch8:               %{name}-errorlog-before-fork.patch
 URL:           http://www.lighttpd.net/
 %{?with_xattr:BuildRequires:   attr-devel}
@@ -353,6 +339,7 @@ kontrolą CSS.
 Summary:       lighttpd evasive module
 Summary(pl.UTF-8):     Moduł evasive dla lighttpd
 Group:         Networking/Daemons/HTTP
+URL:           http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModEvasive
 Requires:      %{name} = %{version}-%{release}
 
 %description mod_evasive
@@ -430,7 +417,7 @@ jak Perl, PHP czy własne aplikacje.
 Summary:       lighttpd module for flv streaming
 Summary(pl.UTF-8):     Moduł lighttpd do streamingu flv
 Group:         Networking/Daemons/HTTP
-URL:           http://blog.lighttpd.net/articles/2006/03/09/flv-streaming-with-lighttpd
+URL:           http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModFLVStreaming
 Requires:      %{name} = %{version}-%{release}
 
 %description mod_flv_streaming
@@ -457,6 +444,7 @@ Moduł lighttpd do pseudostreamingu plików QuickTime/MPEG-4.
 Summary:       lighttpd indexfile module
 Summary(pl.UTF-8):     Moduł indexfile dla lighttpd
 Group:         Networking/Daemons/HTTP
+URL:           http://redmine.lighttpd.net/projects/lighttpd/wiki/Index-file-names.Details
 Requires:      %{name} = %{version}-%{release}
 Provides:      webserver(indexfile)
 
@@ -470,6 +458,7 @@ Moduł indexfile.
 Summary:       lighttpd powermagnet module
 Summary(pl.UTF-8):     Moduł powermagnet dla lighttpd
 Group:         Networking/Daemons/HTTP
+URL:           http://redmine.lighttpd.net/wiki/lighttpd/Docs:ModMagnet
 Requires:      %{name} = %{version}-%{release}
 
 %description mod_magnet
@@ -780,7 +769,8 @@ Summary(pl.UTF-8):  Obsługa PHP przez FastCGI, uruchamianie sterowane zewnętrzn
 Group:         Networking/Daemons/HTTP
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-mod_fastcgi = %{version}-%{release}
-Requires:      php-fcgi-init
+Suggests:      php-fcgi-init
+Suggests:      php-fpm
 Obsoletes:     lighttpd-php-spawned
 
 %description php-external
@@ -793,7 +783,9 @@ Obsługa PHP przez FastCGI, uruchamianie sterowane zewnętrznie.
 Summary:       lighttpd support for SSLv2 and SSLv3
 Summary(pl.UTF-8):     Obsługa SSLv2 i SSLv3 dla lighttpd
 Group:         Networking/Daemons/HTTP
+URL:           http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:SSL
 Requires:      %{name} = %{version}-%{release}
+Suggests:      ca-certificates
 
 %description ssl
 lighttpd support for SSLv2 and SSLv3.
@@ -823,9 +815,6 @@ Plik monitrc do monitorowania serwera www lighttpd.
 %patch2 -p1
 %patch3 -p1
 %{?with_deflate:%patch5 -p1}
-cd src
-%patch6 -p0 -R
-cd ..
 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead
 
@@ -900,7 +889,6 @@ install %{SOURCE107} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_deflate.conf
 install %{SOURCE108} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_dirlisting.conf
 install %{SOURCE109} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_evasive.conf
 install %{SOURCE110} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_evhost.conf
-install %{SOURCE111} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_expire.conf
 install %{SOURCE112} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_fastcgi.conf
 install %{SOURCE113} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_flv_streaming.conf
 install %{SOURCE136} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_h264_streaming.conf
@@ -921,6 +909,8 @@ install %{SOURCE128} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_usertrack.conf
 install %{SOURCE129} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_webdav.conf
 install %{SOURCE133} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_mysql_vhost.conf
 
+install %{SOURCE111} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_expire.conf
+
 install %{SOURCE106} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/60_mod_compress.conf
 
 install %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_accesslog.conf
@@ -941,7 +931,7 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_mysql_vhost.conf
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_deflate.conf
 %endif
 
-touch $RPM_BUILD_ROOT/var/log/%{name}/{access,error}.log
+touch $RPM_BUILD_ROOT/var/log/%{name}/{access,error,breakage}.log
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -953,7 +943,7 @@ rm -rf $RPM_BUILD_ROOT
 %addusertogroup lighttpd http
 
 %post
-for a in access.log error.log; do
+for a in access.log error.log breakage.log; do
        if [ ! -f /var/log/%{name}/$a ]; then
                touch /var/log/%{name}/$a
                chown lighttpd:lighttpd /var/log/%{name}/$a
@@ -1077,6 +1067,7 @@ fi
 %dir %attr(751,root,root) /var/log/%{name}
 %ghost %attr(644,lighttpd,lighttpd) /var/log/%{name}/access.log
 %ghost %attr(644,lighttpd,lighttpd) /var/log/%{name}/error.log
+%ghost %attr(644,lighttpd,lighttpd) /var/log/%{name}/breakage.log
 %dir %attr(770,root,lighttpd) /var/run/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*