- s|/var/log/archiv|/var/log/archive|g

[packages/lighttpd.git] / lighttpd.spec

diff --git a/lighttpd.spec b/lighttpd.spec
index ee1830da7113d26e6a5fe343cc315465db5610fb..980cf2662ee65c263aeb7b14f5d3d693c8c4303c 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -37,7 +37,7 @@
 %define                webdav_progs    1
 %endif
 
-%define                _rel 6.2
+%define                _rel 10
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
@@ -99,12 +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
-Patch4:                %{name}-mod_expire-weeks.patch
 URL:           http://www.lighttpd.net/
 %{?with_xattr:BuildRequires:   attr-devel}
 BuildRequires: autoconf
@@ -745,13 +744,25 @@ lighttpd support for SSLv2 and SSLv3.
 %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
+%patch100 -p0
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
-%patch4 -p1
 
 # build mime.types.conf
 sh %{SOURCE6} /etc/mime.types
@@ -993,8 +1004,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(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
@@ -1201,3 +1211,7 @@ EOF
 %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