Setting tag mom-2.3-5

[mom.git] / pl_mom.spec

diff --git a/pl_mom.spec b/pl_mom.spec
index 5672770..d95c5cb 100644 (file)
--- a/pl_mom.spec
+++ b/pl_mom.spec
@@ -1,6 +1,8 @@
 %define name pl_mom
-%define version 2.0
-%define release 02%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 2.3
+%define taglevel 5
+
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
 Summary: PlanetLab node monitoring tools
 Name: %{name}
@@ -11,12 +13,15 @@ Group: System Environment/Kernel
 Source: %{name}-%{version}.tgz
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 3.0
-URL: http://cvs.planet-lab.org/cvs/pl_mom
+Distribution: PlanetLab %{plrelease}
+URL: %{SCMURL}
+#URL: http://cvs.planet-lab.org/cvs/pl_mom
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: expect
-# swapmon requires vps and bwlimit.py
+# swapmon requires vps and vkill
 Requires: util-vserver, util-vserver-python
+# for bwlimit used in swapmon
+Requires: plnode-utils
 # bwmon requires tc
 Requires: iproute
  
@@ -50,7 +55,7 @@ install -D -m 755 swapmon.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/swapmon.py
 install -D -m 755 swapmon.init $RPM_BUILD_ROOT/%{_initrddir}/swapmon
 
 # Cleanup script
-install -D -m 755 pl_mop.sh $RPM_BUILD_ROOT/usr/local/planetlab/bin/pl_mop.sh
+install -D -m 755 pl_mop.sh $RPM_BUILD_ROOT/usr/bin/pl_mop.sh
 
 # Runs pl_mop and bwmon periodically
 install -D -m 644 pl_mom.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/pl_mom
@@ -96,10 +101,27 @@ exit 0
 %{_datadir}/%{name}/pl_mom.py*
 %{_datadir}/%{name}/swapmon.py*
 %{_initrddir}/swapmon
-/usr/local/planetlab/bin/pl_mop.sh
+/usr/bin/pl_mop.sh
 %{_sysconfdir}/cron.d/pl_mom
 
 %changelog
+* Thu Jul 19 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - mom-2.3-5
+- use bwlimit from plnode
+
+* Tue May 10 2011 Scott Baker <smbaker@gmail.com> - Mom-2.3-4
+- Avoid writing error messages to stdout that are due to errors
+- reported from vps.
+
+* Wed Apr 20 2011 Scott Baker <smbaker@gmail.com> - Mom-2.3-3
+- Fix parsing of vps in swapmon, add swapmon error messages when unparseable
+- lines encountered, add stuck rpm checking to pl_mop
+
+* Sun Dec 13 2009 Daniel Hokka Zakrisson <daniel@hozac.com> - Mom-2.3-2
+- Don't restart disabled services.
+
+* Tue Apr 07 2009 Faiyaz Ahmed <faiyaza@cs.princeton.edu> - Mom-2.3-1
+- Merge from trunk.
+
 * Wed Jul 19 2006 Faiyaz Ahmed <faiyaza@cs.princeton.edu> 0.4-7.planetlab
 - swapmon: Added state info so same reset email does not keep getting
   sent. If slice is already being killed, will wait for a timeout