/usr/local should never be a path for packaged modules. Moving to /usr

diff --git a/pl_mom.cron b/pl_mom.cron
index 3d439af..f4301ff 100644 (file)
--- a/pl_mom.cron
+++ b/pl_mom.cron
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #

-# $Id: pl_mom.cron,v 1.4 2007/02/14 19:24:06 faiyaza Exp $
+# $Id: pl_mom.cron,v 1.5 2007/02/27 23:09:06 faiyaza Exp $

 #
 
 #
 

-@M@    @H@     * *     *       root    /usr/local/planetlab/bin/pl_mop.sh
+@M@    @H@     * *     *       root    /usr/bin/pl_mop.sh

diff --git a/pl_mom.spec b/pl_mom.spec
index 5672770..309810e 100644 (file)
--- a/pl_mom.spec
+++ b/pl_mom.spec
@@ -1,6 +1,6 @@
 %define name pl_mom
 %define name pl_mom

-%define version 2.0
-%define release 02%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 2.1
+%define release 01%{?pldistro:.%{pldistro}}%{?date:.%{date}}

  
 Summary: PlanetLab node monitoring tools
 Name: %{name}
  
 Summary: PlanetLab node monitoring tools
 Name: %{name}


@@ -50,7 +50,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 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
 
 # Runs pl_mop and bwmon periodically
 install -D -m 644 pl_mom.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/pl_mom


@@ -96,7 +96,7 @@ exit 0
 %{_datadir}/%{name}/pl_mom.py*
 %{_datadir}/%{name}/swapmon.py*
 %{_initrddir}/swapmon
 %{_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
 %{_sysconfdir}/cron.d/pl_mom
 
 %changelog