- package dir for mod_compress optional cache-dir; rel 3

[packages/lighttpd.git] / lighttpd.spec

diff --git a/lighttpd.spec b/lighttpd.spec
index d5d3d97e64299d40ec8bed8ee5f3f1dc5d1e477e..320d60b641b7bf69a8f7ef6453555d3b582c1869 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -37,16 +37,16 @@
 %define                webdav_progs    1
 %endif
 
-%define                _rel 8
+%define                _rel 3
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
-Version:       1.4.13
+Version:       1.4.17
 Release:       %{_rel}%{?_snap:.%(echo %{_snap}|tr - _)}%{?_svn:.%{_svn}}
 License:       BSD
 Group:         Networking/Daemons
-Source0:       http://www.lighttpd.net/download/%{name}-%{version}.tar.gz
-# Source0-md5: d775d6478391b95d841a1018c8db0b95
+Source0:       http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2
+# Source0-md5: 85c99c2d6baf8ad9e38e6267efe7d9aa
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user
@@ -99,11 +99,10 @@ Source132:  %{name}-ssl.conf
 Source133:     %{name}-mod_mysql_vhost.conf
 Source134:     %{name}-mod_magnet.conf
 Source135:     %{name}-mod_extforward.conf
-Patch100: %{name}-branch.diff
+#Patch100:     %{name}-branch.diff
 Patch0:                %{name}-use_bin_sh.patch
 Patch1:                %{name}-mod_evasive-status_code.patch
-Patch2:                %{name}-mod_deflate.patch
-Patch3:                %{name}-mod_extforward-v2.patch
+#Patchx:               %{name}-mod_deflate.patch
 URL:           http://www.lighttpd.net/
 %{?with_xattr:BuildRequires:   attr-devel}
 BuildRequires: autoconf
@@ -759,10 +758,9 @@ Plik monitrc do monitorowania serwera baz danych MySQL.
 
 %prep
 %setup -q
-%patch100 -p0
+#%patch100 -p0
 %patch0 -p1
 %patch1 -p1
-%patch3 -p1
 
 # build mime.types.conf
 sh %{SOURCE6} /etc/mime.types
@@ -795,9 +793,10 @@ sh %{SOURCE6} /etc/mime.types
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_lighttpddir}/{cgi-bin,html},/etc/{logrotate.d,rc.d/init.d,sysconfig,monit}} \
        $RPM_BUILD_ROOT%{_sysconfdir}/{conf,webapps}.d \
-       $RPM_BUILD_ROOT{/var/log/{%{name},archiv/%{name}},/var/run/%{name}} \
+       $RPM_BUILD_ROOT{/var/log/{%{name},archive/%{name}},/var/run/%{name}} \
        $RPM_BUILD_ROOT%{_datadir}/lighttpd/errordocs \
-       $RPM_BUILD_ROOT/var/lib/lighttpd
+       $RPM_BUILD_ROOT/var/lib/lighttpd \
+       $RPM_BUILD_ROOT/var/cache/lighttpd/mod_compress
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -1004,7 +1003,7 @@ EOF
 %attr(640,root,lighttpd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.user
 
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
-%attr(750,root,root) %dir /var/log/archiv/%{name}
+%attr(750,root,root) %dir /var/log/archive/%{name}
 %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
@@ -1025,6 +1024,9 @@ EOF
 # rrdtool database is stored there
 %dir %attr(771,root,lighttpd) /var/lib/lighttpd
 
+# mod_compress can put cached files there
+%dir /var/cache/lighttpd
+
 %files mod_access
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_access.conf
@@ -1059,6 +1061,7 @@ EOF
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_compress.conf
 %attr(755,root,root) %{_libdir}/mod_compress.so
+%dir %attr(775,root,lighttpd) /var/cache/lighttpd/mod_compress
 
 %if %{with deflate}
 %files mod_deflate