rpms/ganglia/devel .cvsignore, 1.7, 1.8 ganglia.spec, 1.16, 1.17 sources, 1.8, 1.9 ganglia-3.1.0-r1399-ppc64build.patch, 1.2, NONE

[Kostas Georgiou (georgiou)]

Author: georgiou

Update of /cvs/extras/rpms/ganglia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13483

Modified Files:
	.cvsignore ganglia.spec sources 
Removed Files:
	ganglia-3.1.0-r1399-ppc64build.patch 
Log Message:
Update to 3.1.0 and small fixes


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ganglia/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	11 Jun 2008 19:43:57 -0000	1.7
+++ .cvsignore	17 Jul 2008 01:04:29 -0000	1.8
@@ -1,4 +1 @@
-ganglia-3.0.5.tar.gz
-ganglia-3.0.6.tar.gz
-ganglia-3.0.7.tar.gz
-ganglia-3.1.0.1399.tar.gz
+ganglia-3.1.0.tar.gz


Index: ganglia.spec
===================================================================
RCS file: /cvs/extras/rpms/ganglia/devel/ganglia.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ganglia.spec	13 Jun 2008 15:31:00 -0000	1.16
+++ ganglia.spec	17 Jul 2008 01:04:29 -0000	1.17
@@ -1,16 +1,14 @@
-%define svnrev 1399
-
 Name:               ganglia
 Version:            3.1.0
-Release:            0.3%{?svnrev:.r%{svnrev}}%{?dist}
+Release:            0.4%{?svnrev:.r%{svnrev}}%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
 Group:              Applications/Internet
 License:            BSD
 URL:                http://ganglia.sourceforge.net/
-Source0:            http://www.ganglia.info/snapshots/3.1.x/%{name}-%{version}.%{svnrev}.tar.gz
+Source0:            http://www.ganglia.info/testing//%{name}-%{version}.tar.gz
+#Source0:            http://www.ganglia.info/snapshots/3.1.x/%{name}-%{version}.%{svnrev}.tar.gz
 #Source0:            http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
-Patch0:             ganglia-3.1.0-r1399-ppc64build.patch
 Buildroot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:      rrdtool-devel, apr-devel >= 1
@@ -89,8 +87,7 @@
 programmers can use to build scalable cluster or grid applications
 
 %prep
-%setup -q -n %{name}-%{version}.%{svnrev}
-%patch0 -p1
+%setup -q -n %{name}-%{version}%{?svnrev:.%{svnrev}}
 ## Hey, those shouldn't be executable...
 chmod -x lib/*.{h,x}
 
@@ -98,13 +95,13 @@
 %configure \
     --with-gmetad \
     --disable-static \
-    --with-shared
+    --enable-shared
 
 ## Default to run as user ganglia instead of nobody
 %{__perl} -pi.orig -e 's|nobody|ganglia|g' \
     lib/libgmond.c gmetad/conf.c gmond/g25_config.c \
     gmetad/gmetad.conf gmond/gmond.conf.html ganglia.html \
-    gmond/conf.pod ganglia.pod README
+    gmond/conf.pod ganglia.pod README lib/default_conf.h 
 
 ## Don't have initscripts turn daemons on by default
 %{__perl} -pi.orig -e 's|2345|-|g' \
@@ -145,7 +142,7 @@
 cp -p gmetad/gmetad.conf $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/gmetad.conf
 cp -p mans/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 ## Build default gmond.conf from gmond using the '-t' flag
-gmond/gmond -t > $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/gmond.conf
+gmond/gmond -t | %{__perl} -pe 's|nobody|ganglia|g' > $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/gmond.conf
 
 ## Python bits
 # Copy the python metric modules and .conf files
@@ -252,6 +249,11 @@
 %{_datadir}/%{name}
 
 %changelog
+* Thu Jul 17 2008 Kostas Georgiou <k.georgiou at imperial.ac.uk> 3.1.0-0.4
+- Update to the 3.1.0 pre-release
+- Fixes gmond.conf to use the ganglia user and not nobody
+- Removal of the ppc64 work-around
+ 
 * Fri Jun 13 2008 Jarod Wilson <jwilson at redhat.com> 3.1.0-0.3.r1399
 - One more try at work-around. Needs powerpc64, not ppc64...
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ganglia/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Jun 2008 19:43:57 -0000	1.8
+++ sources	17 Jul 2008 01:04:29 -0000	1.9
@@ -1 +1 @@
-f33f73e8e693da0a7194b477ff4e7752  ganglia-3.1.0.1399.tar.gz
+07aa22905756685adbb412564dd396f1  ganglia-3.1.0.tar.gz


--- ganglia-3.1.0-r1399-ppc64build.patch DELETED ---