- revert removing of default.monitrc, as monit will fail if glob is not matching...

Changed files:
    monit.spec -> 1.37

diff --git a/monit.spec b/monit.spec
index d99a1ea49e1de39cf023a3e179ad0a42af914046..7b23de51a2ca65132aa2d00b0ee2bf6488af917f 100644 (file)
--- a/monit.spec
+++ b/monit.spec
@@ -2,14 +2,14 @@ Summary:      Process monitor and restart utility
 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
@@ -33,7 +33,6 @@ program przestaje odpowiada
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure \
@@ -48,7 +47,9 @@ install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,monit},%{_sbindir}}
        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
@@ -64,19 +65,12 @@ if [ "$1" = "0" ]; then
        /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?/*