X-Git-Url: http://git.onelab.eu/?p=mom.git;a=blobdiff_plain;f=pl_mom.spec;h=d95c5cb7afbb5c7170bed0f49e45556e3b20ea63;hp=832a9fc5f6d6c4fa2d93f00e74971ab4b2a04812;hb=a7ab53cbaf3037b67fbda98fed3887c905d93e96;hpb=d7c356d9cbf362558d3704ef0a69de79d0525441

diff --git a/pl_mom.spec b/pl_mom.spec
index 832a9fc..d95c5cb 100644
--- a/pl_mom.spec
+++ b/pl_mom.spec
@@ -1,11 +1,6 @@
-#
-# $Id$
-#
-%define url $URL$
-
 %define name pl_mom
 %define version 2.3
-%define taglevel 1
+%define taglevel 5
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
@@ -19,12 +14,14 @@ Source: %{name}-%{version}.tgz
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+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
  
@@ -108,6 +105,20 @@ exit 0
 %{_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.