- revert change from #948 (fixes 404 handler status code handling); rel 4

[packages/lighttpd.git] / lighttpd.spec

diff --git a/lighttpd.spec b/lighttpd.spec
index 980cf2662ee65c263aeb7b14f5d3d693c8c4303c..67dfd28f5f9daf1a3a8a8f570c1ba2c58939f1d3 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -37,16 +37,16 @@
 %define                webdav_progs    1
 %endif
 
-%define                _rel 10
+%define                _rel 4
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
-Version:       1.4.13
+Version:       1.4.15
 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: b994b8c359da578dec073cae52c4924f
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user
@@ -99,11 +99,11 @@ 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
+Patch2:                %{name}-revert-948.patch
+#Patchx:               %{name}-mod_deflate.patch
 URL:           http://www.lighttpd.net/
 %{?with_xattr:BuildRequires:   attr-devel}
 BuildRequires: autoconf
@@ -762,7 +762,7 @@ Plik monitrc do monitorowania serwera baz danych MySQL.
 %patch100 -p0
 %patch0 -p1
 %patch1 -p1
-%patch3 -p1
+%patch2 -p3 -R
 
 # build mime.types.conf
 sh %{SOURCE6} /etc/mime.types
@@ -795,7 +795,7 @@ 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