X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fredhat%2Fcollectd.spec;h=4f6306be78828eb7fdb97617b612bd621dbab1a8;hb=bc5073cf25c5cea3a322f70a3a9ba50c67460638;hp=5315870f2addde810e29c794b6544aae98dbdca3;hpb=0c88d3b2d330c152be0bc6af8faecef0211a705e;p=collectd.git diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index 5315870f..4f6306be 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -62,12 +62,12 @@ %{?el7:%global _has_lvm2app_h 1} %{?el7:%global _has_libudev 1} %{?el7:%global _has_recent_librrd 1} -%{?el7:%global _has_varnish4 1} -%{?el7:%global _has_broken_libmemcached 1} %{?el7:%global _has_iproute 1} %{?el7:%global _has_atasmart 1} %{?el7:%global _has_hiredis 1} %{?el7:%global _has_asm_msr_index 1} +%{?el7:%global _has_libmodbus 1} +%{?el7:%global _has_xmms 1} # plugins enabled by default %define with_aggregation 0%{!?_without_aggregation:1} @@ -116,7 +116,7 @@ %define with_madwifi 0%{!?_without_madwifi:1} %define with_mbmon 0%{!?_without_mbmon:1} %define with_md 0%{!?_without_md:1} -%define with_memcachec 0%{!?_without_memcachec:0%{!?_has_broken_libmemcached:1}} +%define with_memcachec 0%{!?_without_memcachec:1} %define with_memcached 0%{!?_without_memcached:1} %define with_memory 0%{!?_without_memory:1} %define with_multimeter 0%{!?_without_multimeter:1} @@ -165,7 +165,7 @@ %define with_uptime 0%{!?_without_uptime:1} %define with_users 0%{!?_without_users:1} %define with_uuid 0%{!?_without_uuid:1} -%define with_varnish 0%{!?_without_varnish:0%{!?_has_varnish4:1}} +%define with_varnish 0%{!?_without_varnish:1} %define with_vmem 0%{!?_without_vmem:1} %define with_vserver 0%{!?_without_vserver:1} %define with_wireless 0%{!?_without_wireless:1} @@ -176,6 +176,7 @@ %define with_write_riemann 0%{!?_without_write_riemann:1} %define with_write_sensu 0%{!?_without_write_sensu:1} %define with_write_tsdb 0%{!?_without_write_tsdb:1} +%define with_xmms 0%{!?_without_xmms:0%{?_has_xmms}} %define with_zfs_arc 0%{!?_without_zfs_arc:1} %define with_zookeeper 0%{!?_without_zookeeper:1} @@ -212,15 +213,13 @@ %define with_write_kafka 0%{!?_without_write_kafka:0} # plugin write_mongodb disabled, requires libmongoc %define with_write_mongodb 0%{!?_without_write_mongodb:0} -# plugin xmms disabled, requires xmms -%define with_xmms 0%{!?_without_xmms:0} Summary: statistics collection and monitoring daemon Name: collectd -Version: 5.4.2 +Version: 5.5.2 Release: 1%{?dist} -URL: http://collectd.org -Source: http://collectd.org/files/%{name}-%{version}.tar.bz2 +URL: https://collectd.org +Source: https://collectd.org/files/%{name}-%{version}.tar.bz2 License: GPLv2 Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -775,6 +774,16 @@ BuildRequires: protobuf-c-devel The riemann plugin submits values to Riemann, an event stream processor. %endif +%if %{with_xmms} +%package xmms +Summary: XMMS plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: xmms-devel +%description xmms +The xmms plugin collects information from the XMMS music player. +%endif + %package collection3 Summary: Web-based viewer for collectd Group: System Environment/Daemons @@ -2055,9 +2064,9 @@ fi %{_includedir}/collectd/network_buffer.h %{_includedir}/collectd/lcc_features.h %{_libdir}/pkgconfig/libcollectdclient.pc +%{_libdir}/libcollectdclient.so %files -n libcollectdclient -%{_libdir}/libcollectdclient.so %{_libdir}/libcollectdclient.so.* %files -n collectd-utils @@ -2323,6 +2332,11 @@ fi %{_libdir}/%{name}/write_riemann.so %endif +%if %{with_xmms} +%files xmms +%{_libdir}/%{name}/xmms.so +%endif + %files collection3 %{_localstatedir}/www/collection3 %{_sysconfdir}/httpd/conf.d/collection3.conf @@ -2335,21 +2349,32 @@ fi %doc contrib/ %changelog -# * TODO 5.5.0-1 -# - New upstream version -# - New plugins enabled by default: ceph, drbd, log_logstash, write_tsdb, smart, openldap, redis, write_redis, zookeeper, write_log, write_sensu, ipc, turbostat -# - New plugins disabled by default: barometer, write_kafka -# - Enable zfs_arc, now supported on Linux -# - 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 -# - Add build-dependency on libcap-devel - -* Mon Aug 19 2013 Marc Fournier 5.4.0-1 +* Tue Jul 26 2016 Ruben Kerkhof - 5.5.2-1 +- New upstream version +- Contains fix for CVE-2016-6254 +- Change collectd.org url to https + +* Sat Jun 04 2016 Ruben Kerkhof 5.5.1-1 +- New upstream version + +* Wed May 27 2015 Marc Fournier 5.5.0-1 +- New upstream version +- New plugins enabled by default: ceph, drbd, log_logstash, write_tsdb, smart, + openldap, redis, write_redis, zookeeper, write_log, write_sensu, ipc, + turbostat, fhcount +- New plugins disabled by default: barometer, write_kafka +- Enable zfs_arc, now supported on Linux +- 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 +- Add build-dependency on libcap-devel + +* Mon Aug 19 2013 Marc Fournier 5.4.2-1 - New upstream version - Build netlink plugin by default - Enable cgroups, lvm and statsd plugins - Enable (but don't build by default) mic, aquaero and sigrok plugins +- Enable modbus, memcachec and xmms plugins on RHEL7 * Tue Aug 06 2013 Marc Fournier 5.3.1-1 - New upstream version