SPECS: monit.spec - main config moved to /etc/monitrc

[glen]

Author: glen                         Date: Mon Feb  5 11:37:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- main config moved to /etc/monitrc

---- Files affected:
SPECS:
   monit.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/monit.spec
diff -u SPECS/monit.spec:1.35 SPECS/monit.spec:1.36
--- SPECS/monit.spec:1.35	Mon Feb  5 12:22:51 2007
+++ SPECS/monit.spec	Mon Feb  5 12:37:17 2007
@@ -3,13 +3,14 @@
 Summary(pl):	Narzędzie do monitorowania procesów i ich restartowania
 Name:		monit
 Version:	4.8.2
-Release:	1
+Release:	1.1
 License:	GPL
 Group:		Applications/Console
 Source0:	http://www.tildeslash.com/monit/dist/%{name}-%{version}.tar.gz
 # Source0-md5:	e7ad6056c71becf014653f6597d110ca
 Source1:	%{name}.init
 Patch0:		%{name}-localhost-http.patch
+Patch1:		monit-config.patch
 URL:		http://www.tildeslash.com/monit/
 BuildRequires:	bison
 BuildRequires:	flex
@@ -33,6 +34,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
@@ -41,17 +43,14 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,monit}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,monit},%{_sbindir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# include all files provided by services:
-echo "include %{_sysconfdir}/monit/*.monitrc" >> monitrc.main
-
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install monitrc.main $RPM_BUILD_ROOT%{_sysconfdir}/monitrc
-install monitrc $RPM_BUILD_ROOT%{_sysconfdir}/monit/default.monitrc
+install monitrc $RPM_BUILD_ROOT%{_sysconfdir}/monitrc
+mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/monit
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,13 +65,20 @@
 	/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
-%attr(751,root,root) %dir %{_sysconfdir}/monit
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/monit/*.monitrc
-%attr(755,root,root) %{_bindir}/*
+%dir %attr(751,root,root) %{_sysconfdir}/monit
+%attr(755,root,root) %{_sbindir}/monit
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %{_mandir}/man?/*
 
@@ -82,6 +88,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2007/02/05 11:37:17  glen
+- main config moved to /etc/monitrc
+
 Revision 1.35  2007/02/05 11:22:51  glen
 - update to 4.8.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/monit.spec?r1=1.35&r2=1.36&f=u