From b61d5cf2a74b54554ab68a857eb01548602dc405 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Wed, 14 Jan 2015 23:40:06 +0100 Subject: [PATCH] RPM specfile: install client tools to a dedicated package Avoids the package containing the daemon to depend on libcollectdclient. Fixes #879 --- contrib/redhat/collectd.spec | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index a4640050..5c7803f4 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -797,6 +797,13 @@ Requires: libcollectdclient%{?_isa} = %{version}-%{release} %description -n libcollectdclient-devel Development files for libcollectdclient +%package -n collectd-utils +Summary: Collectd utilities +Group: System Environment/Daemons +Requires: libcollectdclient%{?_isa} = %{version}-%{release} +Requires: collectd%{?_isa} = %{version}-%{release} +%description -n collectd-utils +Collectd utilities %prep %setup -q @@ -1775,17 +1782,11 @@ fi %{_initrddir}/collectd %endif %{_sbindir}/collectd -%{_bindir}/collectd-nagios -%{_bindir}/collectd-tg -%{_bindir}/collectdctl %{_sbindir}/collectdmon %{_datadir}/collectd/types.db %{_sharedstatedir}/collectd -%{_mandir}/man1/collectd-nagios.1* %{_mandir}/man1/collectd.1* -%{_mandir}/man1/collectdctl.1* %{_mandir}/man1/collectdmon.1* -%{_mandir}/man1/collectd-tg.1* %{_mandir}/man5/collectd-email.5* %{_mandir}/man5/collectd-exec.5* %{_mandir}/man5/collectd-threshold.5* @@ -1997,6 +1998,14 @@ fi %{_libdir}/libcollectdclient.so %{_libdir}/libcollectdclient.so.* +%files -n collectd-utils +%{_bindir}/collectd-nagios +%{_bindir}/collectd-tg +%{_bindir}/collectdctl +%{_mandir}/man1/collectdctl.1* +%{_mandir}/man1/collectd-nagios.1* +%{_mandir}/man1/collectd-tg.1* + %if %{with_amqp} %files amqp %{_libdir}/%{name}/amqp.so @@ -2265,8 +2274,9 @@ fi # - New plugins enabled by default: drbd, log_logstash, write_tsdb, smart, openldap, redis, write_redis, zookeeper, write_log # - New plugins disabled by default: barometer, write_kafka # - Enable zfs_arc, now supported on Linux -# - Install disk plugin in an dedicated package, as it depends on libudev +# - Install disk plugin in a dedicated package, as it depends on libudev # - use systemd on EL7, sysvinit on EL6 & EL5 +# - Install collectdctl, collectd-tg and collectd-nagios in collectd-utils.rpm * Mon Aug 19 2013 Marc Fournier 5.4.0-1 - New upstream version -- 2.30.2