rpms/ganglia/devel ganglia.spec,1.7,1.8
Jarod Wilson (jwilson)
fedora-extras-commits at redhat.com
Thu Oct 25 02:00:19 UTC 2007
- Previous message (by thread): rpms/perl-Carp-Clan/devel perl-Carp-Clan.spec,1.10,1.11
- Next message (by thread): rpms/kdebase/F-7 kdebase-3.5.7-kio_media_mounthelper.patch, NONE, 1.1 kdebase-3.5.7-konsolesu.patch, NONE, 1.1 kdebase-3.5.8-consolekit-kdm.patch, NONE, 1.1 kdebase-3.5.8-konsole-bz#244906.patch, NONE, 1.1 kdebase-3.5.8-redhat-startkde.patch, NONE, 1.1 .cvsignore, 1.57, 1.58 kdebase.spec, 1.260, 1.261 sources, 1.78, 1.79 cr16-app-package_games_kids.png, 1.1, NONE cr32-app-package_games_kids.png, 1.1, NONE cr48-app-package_games_kids.png, 1.1, NONE kdebase-3.5.6-consolekit-kdm.patch, 1.2, NONE kdebase-3.5.7-1-redhat-startkde.patch, 1.1, NONE kdebase-3.5.7-bz#244906.patch, 1.1, NONE post-3.5.7-kdebase-kdm.diff, 1.1, NONE post-3.5.7-kdebase-konqueror-2.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwilson
Update of /cvs/pkgs/rpms/ganglia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30098
Modified Files:
ganglia.spec
Log Message:
* Wed Oct 24 2007 Jarod Wilson <jwilson at redhat.com> 3.0.5-2
- Reorg packages to fix multilib conflicts (#341201)
Index: ganglia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ganglia/devel/ganglia.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ganglia.spec 3 Oct 2007 13:25:12 -0000 1.7
+++ ganglia.spec 25 Oct 2007 01:59:46 -0000 1.8
@@ -1,6 +1,6 @@
Name: ganglia
Version: 3.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Ganglia Distributed Monitoring System
Group: Applications/Internet
@@ -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
@@ -130,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 || :
@@ -168,6 +162,13 @@
%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}
@@ -179,7 +180,6 @@
%files gmond
%defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README ChangeLog
%{_bindir}/gmetric
%{_bindir}/gstat
%{_sbindir}/gmond
@@ -193,8 +193,7 @@
%files devel
%defattr(-,root,root,-)
%{_includedir}/ganglia.h
-%{_libdir}/libganglia*.so*
-%{_bindir}/ganglia-config
+%{_libdir}/libganglia*.so
%exclude %{_libdir}/libganglia.a
%files web
@@ -206,6 +205,9 @@
%{_datadir}/%{name}
%changelog
+* 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
- Previous message (by thread): rpms/perl-Carp-Clan/devel perl-Carp-Clan.spec,1.10,1.11
- Next message (by thread): rpms/kdebase/F-7 kdebase-3.5.7-kio_media_mounthelper.patch, NONE, 1.1 kdebase-3.5.7-konsolesu.patch, NONE, 1.1 kdebase-3.5.8-consolekit-kdm.patch, NONE, 1.1 kdebase-3.5.8-konsole-bz#244906.patch, NONE, 1.1 kdebase-3.5.8-redhat-startkde.patch, NONE, 1.1 .cvsignore, 1.57, 1.58 kdebase.spec, 1.260, 1.261 sources, 1.78, 1.79 cr16-app-package_games_kids.png, 1.1, NONE cr32-app-package_games_kids.png, 1.1, NONE cr48-app-package_games_kids.png, 1.1, NONE kdebase-3.5.6-consolekit-kdm.patch, 1.2, NONE kdebase-3.5.7-1-redhat-startkde.patch, 1.1, NONE kdebase-3.5.7-bz#244906.patch, 1.1, NONE post-3.5.7-kdebase-kdm.diff, 1.1, NONE post-3.5.7-kdebase-konqueror-2.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list