fix initscript status exit code

[packages/monit.git] / monit.spec

diff --git a/monit.spec b/monit.spec
index c395ec563e77dabb2bf2f4132e1fc9d96a0f3147..4d63f171ad5eff4b99651558e33e05da7c13d86d 100644 (file)
--- a/monit.spec
+++ b/monit.spec
@@ -1,16 +1,17 @@
 Summary:       Process monitor and restart utility
-Summary(pl.UTF-8):   Narzędzie do monitorowania procesów i ich restartowania
+Summary(pl.UTF-8):     Narzędzie do monitorowania procesów i ich restartowania
 Name:          monit
-Version:       4.8.2
-Release:       1.2
-License:       GPL
-Group:         Applications/Console
-Source0:       http://www.tildeslash.com/monit/dist/%{name}-%{version}.tar.gz
-# Source0-md5: e7ad6056c71becf014653f6597d110ca
+Version:       5.9
+Release:       2
+License:       AGPL v3
+Group:         Daemons
+Source0:       http://mmonit.com/monit/dist/%{name}-%{version}.tar.gz
+# Source0-md5: 808473ebbacda0c5085d7399e507bfda
 Source1:       %{name}.init
 Source2:       %{name}rc
-Patch0:                %{name}-localhost-http.patch
-URL:           http://www.tildeslash.com/monit/
+Source3:       %{name}.config
+Patch0:                config.patch
+URL:           http://mmonit.com/monit/
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: openssl-devel >= 0.9.7d
@@ -36,21 +37,23 @@ program przestaje odpowiadać.
 
 %build
 %configure \
+       --bindir=%{_sbindir} \
        --with-ssl-lib-dir=%{_libdir}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,monit},%{_sbindir}}
-
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,monit,sysconfig}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/monit
+
+cp -p monitrc $RPM_BUILD_ROOT%{_sysconfdir}/monitrc
 # NOTE: 'include *.monitrc' will fail if nothing matches the glob.
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/monitrc
-install monitrc $RPM_BUILD_ROOT%{_sysconfdir}/monit/default.monitrc
-mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/monit
+# so install dummy config not to remove it with upgrades (avoid .rpmsave)
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/monit/default.monitrc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,10 +70,11 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc/*.html CHANGES.txt CONTRIBUTORS FAQ.txt README*
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}rc
-%dir %attr(751,root,root) %{_sysconfdir}/monit
+%doc CONTRIBUTORS README*
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/monitrc
+%dir %attr(751,root,root) %{_sysconfdir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/default.monitrc
-%attr(755,root,root) %{_sbindir}/monit
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/monit
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%{_mandir}/man?/*
+%attr(755,root,root) %{_sbindir}/monit
+%{_mandir}/man1/monit.1*