%define webdav_progs 1
%endif
-%define _rel 6.2
+%define _rel 1
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
Source133: %{name}-mod_mysql_vhost.conf
Source134: %{name}-mod_magnet.conf
Source135: %{name}-mod_extforward.conf
-#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
-Patch4: %{name}-mod_expire-weeks.patch
URL: http://www.lighttpd.net/
%{?with_xattr:BuildRequires: attr-devel}
BuildRequires: autoconf
%description ssl -l pl.UTF-8
Obsługa SSLv2 i SSLv3 dla lighttpd.
+%package -n monit-rc-lighttpd
+Summary: lighttpd support for monit
+Summary(pl.UTF-8): Wsparcie lighttpd dla monit
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+Requires: monit
+
+%description -n monit-rc-lighttpd
+monitrc file for monitoring MySQL database server.
+
+%description -n monit-rc-lighttpd -l pl.UTF-8
+Plik monitrc do monitorowania serwera baz danych MySQL.
+
%prep
%setup -q
-#%patch100 -p1
%patch0 -p1
%patch1 -p1
-%patch3 -p1
-%patch4 -p1
# build mime.types.conf
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
%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(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/%{name}.monitrc
-%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
%files ssl
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ssl.conf
+
+%files -n monit-rc-lighttpd
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/%{name}.monitrc