Author: glen                         Date: Thu Dec  1 01:55:52 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 4.6
- refresh macros

---- Files affected:
SPECS:
   monit.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SPECS/monit.spec
diff -u SPECS/monit.spec:1.27 SPECS/monit.spec:1.28
--- SPECS/monit.spec:1.27       Sun Jul  3 18:45:03 2005
+++ SPECS/monit.spec    Thu Dec  1 02:55:46 2005
@@ -2,19 +2,20 @@
 Summary:       Process monitor and restart utility
 Summary(pl):   Narzędzie do monitorowania procesów i ich restartowania
 Name:          monit
-Version:       4.5.1
+Version:       4.6
 Release:       1
 Group:         Applications/Console
 License:       GPL
 Source0:       http://www.tildeslash.com/monit/dist/%{name}-%{version}.tar.gz
-# Source0-md5: 0f054ac39822b4be71789d49e4813754
+# Source0-md5: 4e53aa44e4ca264e61c7c401cee4e697
 Source1:       %{name}.init
 URL:           http://www.tildeslash.com/monit/
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: openssl-devel >= 0.9.7d
-PreReq:                rc-scripts
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/chkconfig
+Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -23,9 +24,10 @@
 running and restart programs not responding.
 
 %description -l pl
-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ć.
+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
@@ -43,7 +45,7 @@
        DESTDIR=$RPM_BUILD_ROOT
 
 # include all files provided by services:
-echo "include /etc/monit/*.monitrc" >> monitrc.main
+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
@@ -54,17 +56,11 @@
 
 %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
+       %service monit stop
        /sbin/chkconfig --del %{name}
 fi
 
@@ -84,6 +80,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2005/12/01 01:55:46  glen
+- updated to 4.6
+- refresh macros
+
 Revision 1.27  2005/07/03 16:45:03  arekm
 - up to 4.5.1
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to