rpms/ganglia/FC-5 .cvsignore, 1.2, 1.3 ganglia.spec, 1.2, 1.3 sources, 1.2, 1.3

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/ganglia/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25762

Modified Files:
	.cvsignore ganglia.spec sources 
Log Message:
New upstream release v3.0.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ganglia/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Jun 2006 20:15:48 -0000	1.2
+++ .cvsignore	2 Jan 2007 16:43:36 -0000	1.3
@@ -1 +1,2 @@
 ganglia-3.0.3.tar.gz
+ganglia-3.0.4.tar.gz


Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/FC-5/ganglia.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ganglia.spec	9 Nov 2006 19:25:58 -0000	1.2
+++ ganglia.spec	2 Jan 2007 16:43:36 -0000	1.3
@@ -1,15 +1,15 @@
-Name:		ganglia
-Version:	3.0.3
-Release:	8%{?dist}
-Summary:	Ganglia Distributed Monitoring System
-
-Group:		Applications/Internet
-License:	BSD
-URL:		http://ganglia.sourceforge.net/
-Source0:	http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
-Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:               ganglia
+Version:            3.0.4
+Release:            1%{?dist}
+Summary:            Ganglia Distributed Monitoring System
+
+Group:              Applications/Internet
+License:            BSD
+URL:                http://ganglia.sourceforge.net/
+Source0:            http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Buildroot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	rrdtool-devel
+BuildRequires:      rrdtool-devel
 
 %description
 Ganglia is a scalable, real-time monitoring and execution environment
@@ -17,10 +17,10 @@
 well-defined XML format.
 
 %package web
-Summary:	Ganglia Web Frontend
-Group:		Applications/Internet
-Requires:	rrdtool
-Requires:	%{name}-gmetad >=  3.0.3
+Summary:            Ganglia Web Frontend
+Group:              Applications/Internet
+Requires:           rrdtool, php
+Requires:           %{name}-gmetad = %{version}-%{release}
 
 %description web
 This package provides a web frontend to display the XML tree published by
@@ -28,8 +28,11 @@
 written in the PHP4 language.
 
 %package gmetad
-Summary:	Ganglia Metadata collection daemon
-Group:		Applications/Internet
+Summary:            Ganglia Metadata collection daemon
+Group:              Applications/Internet
+Requires(post):     /sbin/chkconfig
+Requires(preun):    /sbin/chkconfig
+Requires(preun):    /sbin/service
 
 %description gmetad
 Ganglia is a scalable, real-time monitoring and execution environment
@@ -40,8 +43,11 @@
 to form a monitoring grid. It also keeps metric history using rrdtool.
 
 %package gmond
-Summary:	Ganglia Monitoring daemon
-Group:		Applications/Internet
+Summary:            Ganglia Monitoring daemon
+Group:              Applications/Internet
+Requires(post):     /sbin/chkconfig
+Requires(preun):    /sbin/chkconfig
+Requires(preun):    /sbin/service
 
 %description gmond
 Ganglia is a scalable, real-time monitoring and execution environment
@@ -52,8 +58,8 @@
 Multicast domain.
 
 %package devel
-Summary:	Ganglia Library http://ganglia.sourceforge.net/
-Group:		Applications/Internet
+Summary:            Ganglia Library
+Group:              Applications/Internet
 
 %description devel
 The Ganglia Monitoring Core library provides a set of functions that
@@ -61,19 +67,17 @@
 
 %prep 
 %setup -q
-# Hey, those shouldn't be executable...
+## Hey, those shouldn't be executable...
 chmod -x lib/{net,rdwr,hash,llist}.h \
-    srclib/libmetrics/linux/fsusage.h \
-    srclib/libmetrics/error.c
+    libmetrics/linux/fsusage.h \
+    libmetrics/error.c \
+    libmetrics/debug_msg.h
 
 %build
 %configure \
-    --prefix=/usr \
-    --libdir=%{_libdir} \
     --with-gmetad \
-    --with-shared \
-    LDFLAGS="-L%{_libdir}"
-    ### Build currently fails if enabled
+    --with-shared
+## Build currently fails if enabled
     #--disable-static \
 
 ## Default to run as user ganglia instead of nobody
@@ -134,12 +138,12 @@
 ### both packages try to add the user (second one should just
 ### fail silently).
 %pre gmetad
-# Add the "ganglia" user
+## Add the "ganglia" user
 /usr/sbin/useradd -c "Ganglia Monitoring System" \
         -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
 
 %pre gmond
-# Add the "ganglia" user
+## Add the "ganglia" user
 /usr/sbin/useradd -c "Ganglia Monitoring System" \
         -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
 
@@ -152,24 +156,14 @@
 %preun gmetad
 if [ "$1" = 0 ]
 then
-  # No conditional stop provided. :(
-  /sbin/service gmetad status
-  if [ "$?" -eq 0 ]
-  then
-    /sbin/service gmetad stop
-  fi
+  /sbin/service gmetad stop >/dev/null 2>&1 || :
   /sbin/chkconfig --del gmetad
 fi
 
 %preun gmond
 if [ "$1" = 0 ]
 then
-  # No conditional stop provided. :(
-  /sbin/service gmond status
-  if [ "$?" -eq 0 ]
-  then
-    /sbin/service gmond stop
-  fi
+  /sbin/service gmond stop >/dev/null 2>&1 || :
   /sbin/chkconfig --del gmond
 fi
 
@@ -213,9 +207,24 @@
 %{_datadir}/%{name}
 
 %changelog
-* Thu Nov 09 2006 Jarod Wilson <jwilson at redhat.com> 3.0.3-8
+* Tue Jan 02 2007 Jarod Wilson <jwilson at redhat.com> 3.0.4-1
+- New upstream release
+
+* Thu Nov 09 2006 Jarod Wilson <jwilson at redhat.com> 3.0.3-11
 - gmond also needs ganglia user (#214762)
 
+* Tue Sep 05 2006 Jarod Wilson <jwilson at redhat.com> 3.0.3-10
+- Rebuild for new glibc
+
+* Fri Jul 28 2006 Jarod Wilson <jwilson at redhat.com> 3.0.3-9
+- Add missing Reqs on chkconfig and service
+- Make %%preun sections match Fedora Extras standards
+- Minor %%configure tweak
+
+* Tue Jul 11 2006 Jarod Wilson <jwilson at redhat.com> 3.0.3-8
+- Add missing php req for ganglia-web
+- Misc tiny spec cleanups
+
 * Tue Jun 13 2006 Jarod Wilson <jwilson at redhat.com> 3.0.3-7
 - Clean up documentation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ganglia/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Jun 2006 20:15:48 -0000	1.2
+++ sources	2 Jan 2007 16:43:36 -0000	1.3
@@ -1 +1,2 @@
 c48320a112db20e8372ae8e89d97583e  ganglia-3.0.3.tar.gz
+9a51023accb59b6ba76c10d7cb7322fa  ganglia-3.0.4.tar.gz