Permalink
Browse files

*** empty log message ***

  • Loading branch information...
1 parent 978cb1b commit 9f7a6e8f3a3b4eb037ad4ef2b437ce8eb089814e massie committed Sep 17, 2002
Showing with 14 additions and 9 deletions.
  1. +1 −1 monitor-core/Makefile.am
  2. +11 −6 monitor-core/ganglia.spec.in
  3. +1 −1 monitor-core/gmetad/data_thread.c
  4. +1 −1 monitor-core/gmond/Makefile.am
View
@@ -10,7 +10,7 @@ SUBDIRS = lib $(GMETAD_SUBDIR) gmond gmetric
DIST_SUBDIRS = lib gmetad gmond gmetric
-EXTRA_DIST = config gmond.init ganglia.spec gmond.init.SuSE mans lib/ganglia
+EXTRA_DIST = config ganglia.spec mans lib/ganglia
# This is a symbolic link that needs to be clean'd out
dist-hook:
@@ -8,7 +8,7 @@ Name: @PACKAGE@
Version: @VERSION@
Release: 1
Copyright: BSD
-Vendor: Matt Massie <massie@cs.berkeley.edu>
+Vendor: Ganglia Development Team <ganglia-developers@lists.sourceforge.net>
Group: System Environment/Base
Obsoletes: ganglia-monitor-core-gmond
Obsoletes: ganglia-monitor-core-gmetric
@@ -19,12 +19,12 @@ Buildroot: /tmp/%{name}-%{version}-buildroot
Prefix: /usr
%package lib
-Summary: Ganglia Cluster Toolkit Library http://ganglia.sourceforge.net/
+Summary: Ganglia Toolkit Library http://ganglia.sourceforge.net/
Group: System Environment/Base
%description
-Ganglia is a scalable, real-time cluster monitoring and execution environment
-with all execution requests and cluster statistics expressed in an open
+Ganglia is a scalable, real-time monitoring and execution environment
+with all execution requests and statistics expressed in an open
well-defined XML format.
%description lib
@@ -42,7 +42,7 @@ can use to build scalable cluster or grid applications
## BUILD
##
%build
-./configure -prefix=$RPM_BUILD_ROOT/usr
+./configure --with-gmetad --prefix=/usr
make
##
@@ -67,7 +67,9 @@ fi
if [ "$1" = 0 ]
then
/etc/rc.d/init.d/gmond stop
+ /etc/rc.d/init.d/gmetad stop
/sbin/chkconfig --del gmond
+ /sbin/chkconfig --del gmetad
fi
##
@@ -86,7 +88,8 @@ fi
%__mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
%__mkdir -p $RPM_BUILD_ROOT/usr/include/ganglia
%__cp -f %{_builddir}/%{name}-%{version}/gmond/gmond.init $RPM_BUILD_ROOT/etc/rc.d/init.d/gmond
-%__make install
+%__cp -f %{_builddir}/%{name}-%{version}/gmetad/gmetad.init $RPM_BUILD_ROOT/etc/rc.d/init.d/gmetad
+%__make install prefix=$RPM_BUILD_ROOT/usr
##
## FILES
@@ -96,7 +99,9 @@ fi
%attr(0500,root,root)/usr/bin/gmetric
%attr(0555,root,root)/usr/bin/gstat
/usr/sbin/gmond
+/usr/sbin/gmetad
/etc/rc.d/init.d/gmond
+/etc/rc.d/init.d/gmetad
%files lib
/usr/include/ganglia.h
@@ -190,7 +190,7 @@ data_thread ( void *arg )
goto take_a_break;
}
- /* We processed all the data mark this source as alive */
+ /* We processed all the data. Mark this source as alive */
d->dead = 0;
take_a_break:
@@ -1,6 +1,6 @@
SUBDIRS = gstat
-EXTRA_DIST = machines
+EXTRA_DIST = machines gmond.init
AM_CFLAGS = -I../lib -I../lib/dnet

0 comments on commit 9f7a6e8

Please sign in to comment.