rpms/ganglia/EL-4 .cvsignore, 1.3, 1.4 ganglia.spec, 1.4, 1.5 sources, 1.3, 1.4

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/ganglia/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23631

Modified Files:
	.cvsignore ganglia.spec sources 
Log Message:
* Mon Dec 17 2007 Jarod Wilson <jwilson at redhat.com> 3.0.6-1
- New upstream release (security fix for web frontend
  cross-scripting vulnerability)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ganglia/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jan 2007 15:51:06 -0000	1.3
+++ .cvsignore	19 Dec 2007 15:55:29 -0000	1.4
@@ -1,2 +1,2 @@
-ganglia-3.0.3.tar.gz
-ganglia-3.0.4.tar.gz
+ganglia-3.0.5.tar.gz
+ganglia-3.0.6.tar.gz


Index: ganglia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ganglia/EL-4/ganglia.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ganglia.spec	2 Jan 2007 15:51:06 -0000	1.4
+++ ganglia.spec	19 Dec 2007 15:55:29 -0000	1.5
@@ -1,5 +1,5 @@
 Name:               ganglia
-Version:            3.0.4
+Version:            3.0.6
 Release:            1%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
@@ -19,7 +19,7 @@
 %package web
 Summary:            Ganglia Web Frontend
 Group:              Applications/Internet
-Requires:           rrdtool, php
+Requires:           rrdtool, php, php-gd
 Requires:           %{name}-gmetad = %{version}-%{release}
 
 %description web
@@ -30,6 +30,7 @@
 %package gmetad
 Summary:            Ganglia Metadata collection daemon
 Group:              Applications/Internet
+Requires:           %{name} = %{version}-%{release}
 Requires(post):     /sbin/chkconfig
 Requires(preun):    /sbin/chkconfig
 Requires(preun):    /sbin/service
@@ -45,6 +46,7 @@
 %package gmond
 Summary:            Ganglia Monitoring daemon
 Group:              Applications/Internet
+Requires:           %{name} = %{version}-%{release}
 Requires(post):     /sbin/chkconfig
 Requires(preun):    /sbin/chkconfig
 Requires(preun):    /sbin/service
@@ -60,6 +62,7 @@
 %package devel
 Summary:            Ganglia Library
 Group:              Applications/Internet
+Requires:           %{name} = %{version}-%{release}
 
 %description devel
 The Ganglia Monitoring Core library provides a set of functions that
@@ -68,10 +71,7 @@
 %prep 
 %setup -q
 ## Hey, those shouldn't be executable...
-chmod -x lib/{net,rdwr,hash,llist}.h \
-    libmetrics/linux/fsusage.h \
-    libmetrics/error.c \
-    libmetrics/debug_msg.h
+chmod -x lib/*.{h,x}
 
 %build
 %configure \
@@ -133,16 +133,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-### Both gmetad and gmond require user ganglia, but monitored
-### nodes only need gmond, servers only need gmetad... So have
-### both packages try to add the user (second one should just
-### fail silently).
-%pre gmetad
-## 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
+%pre
 ## Add the "ganglia" user
 /usr/sbin/useradd -c "Ganglia Monitoring System" \
         -s /sbin/nologin -r -d %{_localstatedir}/lib/%{name} ganglia 2> /dev/null || :
@@ -171,8 +162,16 @@
 
 %postun devel -p /sbin/ldconfig
 
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README ChangeLog
+%{_libdir}/libganglia*.so.*
+%{_bindir}/ganglia-config
+
 %files gmetad
 %defattr(-,root,root,-)
+%dir %{_localstatedir}/lib/%{name}
 %attr(0755,ganglia,ganglia) %{_localstatedir}/lib/%{name}/rrds
 %{_sbindir}/gmetad
 %{_mandir}/man1/gmetad.1*
@@ -181,7 +180,6 @@
 
 %files gmond
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README ChangeLog
 %{_bindir}/gmetric
 %{_bindir}/gstat
 %{_sbindir}/gmond
@@ -195,18 +193,34 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/ganglia.h
-%{_libdir}/libganglia*.so*
-%{_bindir}/ganglia-config
+%{_libdir}/libganglia*.so
 %exclude %{_libdir}/libganglia.a
 
 %files web
 %defattr(-,root,root,-)
 %doc web/AUTHORS web/COPYING web/ChangeLog
+%dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/conf.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{_datadir}/%{name}
 
 %changelog
+* Mon Dec 17 2007 Jarod Wilson <jwilson at redhat.com> 3.0.6-1
+- New upstream release (security fix for web frontend
+  cross-scripting vulnerability)
+
+* Wed Oct 24 2007 Jarod Wilson <jwilson at redhat.com> 3.0.5-2
+- Reorg packages to fix multilib conflicts (#341201)
+
+* Wed Oct 03 2007 Jarod Wilson <jwilson at redhat.com> 3.0.5-1
+- New upstream release
+
+* Fri May 18 2007 Jarod Wilson <jwilson at redhat.com> 3.0.4-3
+- Add missing Req: php-gd so people will see nifty pie charts
+
+* Sat Mar 24 2007 Jarod Wilson <jwilson at redhat.com> 3.0.4-2
+- Own created directories (#233790)
+
 * Tue Jan 02 2007 Jarod Wilson <jwilson at redhat.com> 3.0.4-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ganglia/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jan 2007 15:51:06 -0000	1.3
+++ sources	19 Dec 2007 15:55:29 -0000	1.4
@@ -1,2 +1 @@
-c48320a112db20e8372ae8e89d97583e  ganglia-3.0.3.tar.gz
-9a51023accb59b6ba76c10d7cb7322fa  ganglia-3.0.4.tar.gz
+f2fecaae424be95ddf8b2cc6247be31d  ganglia-3.0.6.tar.gz