Author: glen Date: Mon Feb 5 16:53:39 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - revert removing of default.monitrc, as monit will fail if glob is not matching anything
---- Files affected: SPECS: monit.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/monit.spec diff -u SPECS/monit.spec:1.36 SPECS/monit.spec:1.37 --- SPECS/monit.spec:1.36 Mon Feb 5 12:37:17 2007 +++ SPECS/monit.spec Mon Feb 5 17:53:34 2007 @@ -3,14 +3,14 @@ Summary(pl): Narzędzie do monitorowania procesów i ich restartowania Name: monit Version: 4.8.2 -Release: 1.1 +Release: 1.2 License: GPL Group: Applications/Console Source0: http://www.tildeslash.com/monit/dist/%{name}-%{version}.tar.gz # Source0-md5: e7ad6056c71becf014653f6597d110ca Source1: %{name}.init +Source2: %{name}rc Patch0: %{name}-localhost-http.patch -Patch1: monit-config.patch URL: http://www.tildeslash.com/monit/ BuildRequires: bison BuildRequires: flex @@ -34,7 +34,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %configure \ @@ -49,7 +48,9 @@ DESTDIR=$RPM_BUILD_ROOT install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} -install 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 %clean @@ -65,19 +66,12 @@ /sbin/chkconfig --del %{name} fi -%triggerpostun -- %{name} < 4.8.2-1.1 -if [ -f %{_sysconfdir}/monit/default.monitrc.rpmsave ]; then - cp -f %{_sysconfdir}/monitrc{,.rpmnew} - mv -f %{_sysconfdir}/monit{/default.monitrc.rpmsave,rc} - echo 'include /etc/monit/*.monitrc' >> %{_sysconfdir}/monitrc - %service -q monit restart -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 +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/default.monitrc %attr(755,root,root) %{_sbindir}/monit %attr(754,root,root) /etc/rc.d/init.d/%{name} %{_mandir}/man?/* @@ -88,6 +82,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.37 2007/02/05 16:53:34 glen +- revert removing of default.monitrc, as monit will fail if glob is not matching anything + Revision 1.36 2007/02/05 11:37:17 glen - main config moved to /etc/monitrc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/monit.spec?r1=1.36&r2=1.37&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
