re-add Marco's .gitignore after re-running the svn2git as per git-clone-svn.sh

[mom.git] / pl_mom.spec

diff --git a/pl_mom.spec b/pl_mom.spec
index e8c4f47..e5bff47 100644 (file)
--- a/pl_mom.spec
+++ b/pl_mom.spec
@@ -1,6 +1,13 @@
+#
+# $Id$
+#
+%define url $URL$
+
 %define name pl_mom
-%define version 2.2
-%define release 02%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 2.3
+%define taglevel 4
+
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
 Summary: PlanetLab node monitoring tools
 Name: %{name}
@@ -11,8 +18,9 @@ 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: %(echo %{url} | cut -d ' ' -f 2)
+#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
@@ -100,6 +108,20 @@ exit 0
 %{_sysconfdir}/cron.d/pl_mom
 
 %changelog
+* 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