X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=pl_mom.spec;h=4c54a4d17edcb567b0d38c9e2cba569034365d06;hb=bf670de2d8ee2e118deb549a2491e751700b1906;hp=ead33604a0eef80742b856aa5ed01bb98404bcbc;hpb=c0544964d939b78d9539fcebe2e857140de7a571;p=mom.git

diff --git a/pl_mom.spec b/pl_mom.spec
index ead3360..4c54a4d 100644
--- a/pl_mom.spec
+++ b/pl_mom.spec
@@ -1,7 +1,9 @@
 %define name pl_mom
-%define version 1.0
-%define release 01%{?pldistro:.%{pldistro}}%{?date:.%{date}}
- 
+%define version 2.2
+%define taglevel 4
+
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+
 Summary: PlanetLab node monitoring tools
 Name: %{name}
 Version: %{version}
@@ -50,10 +52,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
-
-# Tests and restarts NM
-#install -D -m 755 nm_mom.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/nm_mom.py
+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
@@ -97,14 +96,19 @@ exit 0
 %files
 %defattr(-, root, root, -)
 %{_datadir}/%{name}/pl_mom.py*
-#%{_datadir}/%{name}/nm_mom.py*
-#%{_datadir}/%{name}/bwmon.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 Apr 24 2008 Faiyaz Ahmed <faiyaza@cs.princeton.edu> - Mom-2.2-4
+- 
+- * Send mail from hostname if conf file can't be found
+- * Use MOM address in conf file insead of support address.
+- * Use new Vserver.  Start slices without INITSCRIPTS after kill so user can still log in.
+- 
+
 * 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