- offical patch to 4.8.1

[packages/monit.git] / monit.spec

diff --git a/monit.spec b/monit.spec
index 2fc6d4f6097c27f399dbcacc1c0d230f46c69a44..63f90e59e75a4822f82ebe2837270320647b3429 100644 (file)
--- a/monit.spec
+++ b/monit.spec
@@ -1,18 +1,22 @@
 Summary:       Process monitor and restart utility
 Summary(pl):   Narzêdzie do monitorowania procesów i ich restartowania
 Name:          monit
-Version:       3.2
+%define                _ver 4.8
+Version:       %{_ver}.1
 Release:       1
-Group:         Applications/Console
 License:       GPL
-Source0:       http://www.tildeslash.com/monit/dist/%{name}-%{version}.tar.gz
+Group:         Applications/Console
+Source0:       http://www.tildeslash.com/monit/dist/%{name}-%{_ver}.tar.gz
+# Source0-md5: 376bd526ee5577a6f0a842216f8ccf25
 Source1:       %{name}.init
+Patch0:                http://www.tildeslash.com/monit/dist/%{name}-4.8-patch01
 URL:           http://www.tildeslash.com/monit/
 BuildRequires: bison
 BuildRequires: flex
-BuildRequires: openssl-devel >= 0.9.7
-PreReq:                rc-scripts
+BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/chkconfig
+Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -21,51 +25,53 @@ on a Unix system. It will start specified programs if they are not
 running and restart programs not responding.
 
 %description -l pl
-monit jest narzêdziem do monitorowania demonów oraz podonych programów
-pracuj±cych w systemie Unix. monit zrestartuje podany program w
-momencie gdy przestaje on pracowaæ lub w momencie gdy program
-przestaje odpowiadaæ.
+monit jest narzêdziem do monitorowania demonów oraz podobnych
+programów pracuj±cych w systemie Unix. monit zrestartuje podany
+program w momencie gdy przestaje on pracowaæ lub w momencie gdy
+program przestaje odpowiadaæ.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_ver}
+%patch0 -p0
 
 %build
-%configure
+%configure \
+       --with-ssl-lib-dir=%{_libdir}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,monit}
 
 %{__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 $RPM_BUILD_ROOT%{_sysconfdir}
+install monitrc.main $RPM_BUILD_ROOT%{_sysconfdir}/monitrc
+install monitrc $RPM_BUILD_ROOT%{_sysconfdir}/monit/default.monitrc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f %{_var}/lock/subsys/%{name} ]; then
-        /etc/rc.d/init.d/%{name} restart 1>&2
-else
-        echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon."
-fi
+%service monit restart "Monit Daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-        if [ -f %{_var}/lock/subsys/%{name} ]; then
-                /etc/rc.d/init.d/%{name} stop 1>&2
-        fi
-        /sbin/chkconfig --del %{name}
+       %service monit stop
+       /sbin/chkconfig --del %{name}
 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}/*
-%{_mandir}/man?/*
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}rc
+%{_mandir}/man?/*