X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcollectd.git;a=blobdiff_plain;f=collectd.spec;h=ced0315d8f7048c5ce352908a75b35a47431a3bb;hp=031fd6a0c5b42baa8c080e7050796ccd9aa04aae;hb=HEAD;hpb=d964453857d907fb64d937fe2a739d8aaf4f9ad3

diff --git a/collectd.spec b/collectd.spec
index 031fd6a..9b7d21c 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,61 +1,96 @@
 # TODO:
 #warning: Installed (but unpackaged) file(s) found:
-#    /etc/collectd.d/aggregation.conf
-#    /etc/collectd.d/ceph.conf
-#    /etc/collectd.d/cgroups.conf
-#    /etc/collectd.d/drbd.conf
-#    /etc/collectd.d/fhcount.conf
-#    /etc/collectd.d/ipc.conf
-#    /etc/collectd.d/java.conf
-#    /etc/collectd.d/log_logstash.conf
-#    /etc/collectd.d/lvm.conf
-#    /etc/collectd.d/openldap.conf
-#    /etc/collectd.d/pinba.conf
-#    /etc/collectd.d/redis.conf
-#    /etc/collectd.d/sigrok.conf
-#    /etc/collectd.d/smart.conf
-#    /etc/collectd.d/statsd.conf
-#    /etc/collectd.d/tail_csv.conf
-#    /etc/collectd.d/target_v5upgrade.conf
-#    /etc/collectd.d/turbostat.conf
-#    /etc/collectd.d/write_log.conf
-#    /etc/collectd.d/write_redis.conf
-#    /etc/collectd.d/write_riemann.conf
-#    /etc/collectd.d/write_sensu.conf
-#    /etc/collectd.d/write_tsdb.conf
-#    /etc/collectd.d/zfs_arc.conf
-#    /etc/collectd.d/zookeeper.conf
-#    /usr/bin/collectd-tg
-#    /usr/lib64/collectd/aggregation.so
-#    /usr/lib64/collectd/ceph.so
-#    /usr/lib64/collectd/cgroups.so
-#    /usr/lib64/collectd/drbd.so
-#    /usr/lib64/collectd/fhcount.so
-#    /usr/lib64/collectd/ipc.so
-#    /usr/lib64/collectd/java.so
-#    /usr/lib64/collectd/log_logstash.so
-#    /usr/lib64/collectd/lvm.so
-#    /usr/lib64/collectd/openldap.so
-#    /usr/lib64/collectd/pinba.so
-#    /usr/lib64/collectd/redis.so
-#    /usr/lib64/collectd/sigrok.so
-#    /usr/lib64/collectd/smart.so
-#    /usr/lib64/collectd/statsd.so
-#    /usr/lib64/collectd/tail_csv.so
-#    /usr/lib64/collectd/turbostat.so
-#    /usr/lib64/collectd/write_log.so
-#    /usr/lib64/collectd/write_redis.so
-#    /usr/lib64/collectd/write_riemann.so
-#    /usr/lib64/collectd/write_sensu.so
-#    /usr/lib64/collectd/write_tsdb.so
-#    /usr/lib64/collectd/zfs_arc.so
-#    /usr/lib64/collectd/zookeeper.so
-#    /usr/share/collectd/collection3/README
-#    /usr/share/collectd/collection3/bin/.htaccess
-#    /usr/share/collectd/collection3/test.px
-#    /usr/share/collectd/java/collectd-api.jar
-#    /usr/share/collectd/java/generic-jmx.jar
-#    /usr/share/man/man1/collectd-tg.1.gz
+#	/etc/collectd.d/aggregation.conf
+#	/etc/collectd.d/amqp.conf
+#	/etc/collectd.d/barometer.conf
+#	/etc/collectd.d/ceph.conf
+#	/etc/collectd.d/cgroups.conf
+#	/etc/collectd.d/check_uptime.conf
+#	/etc/collectd.d/chrony.conf
+#	/etc/collectd.d/connectivity.conf
+#	/etc/collectd.d/cpusleep.conf
+#	/etc/collectd.d/drbd.conf
+#	/etc/collectd.d/fhcount.conf
+#	/etc/collectd.d/gps.conf
+#	/etc/collectd.d/hugepages.conf
+#	/etc/collectd.d/ipc.conf
+#	/etc/collectd.d/log_logstash.conf
+#	/etc/collectd.d/lua.conf
+#	/etc/collectd.d/lvm.conf
+#	/etc/collectd.d/mcelog.conf
+#	/etc/collectd.d/mqtt.conf
+#	/etc/collectd.d/notify_nagios.conf
+#	/etc/collectd.d/openldap.conf
+#	/etc/collectd.d/ovs_events.conf
+#	/etc/collectd.d/ovs_stats.conf
+#	/etc/collectd.d/pcie_errors.conf
+#	/etc/collectd.d/pinba.conf
+#	/etc/collectd.d/procevent.conf
+#	/etc/collectd.d/redis.conf
+#	/etc/collectd.d/smart.conf
+#	/etc/collectd.d/snmp_agent.conf
+#	/etc/collectd.d/statsd.conf
+#	/etc/collectd.d/sysevent.conf
+#	/etc/collectd.d/tail_csv.conf
+#	/etc/collectd.d/target_v5upgrade.conf
+#	/etc/collectd.d/turbostat.conf
+#	/etc/collectd.d/write_kafka.conf
+#	/etc/collectd.d/write_log.conf
+#	/etc/collectd.d/write_prometheus.conf
+#	/etc/collectd.d/write_redis.conf
+#	/etc/collectd.d/write_sensu.conf
+#	/etc/collectd.d/write_stackdriver.conf
+#	/etc/collectd.d/write_syslog.conf
+#	/etc/collectd.d/write_tsdb.conf
+#	/etc/collectd.d/xencpu.conf
+#	/etc/collectd.d/zfs_arc.conf
+#	/etc/collectd.d/zookeeper.conf
+#	/usr/lib64/collectd/aggregation.so
+#	/usr/lib64/collectd/amqp.so
+#	/usr/lib64/collectd/barometer.so
+#	/usr/lib64/collectd/ceph.so
+#	/usr/lib64/collectd/cgroups.so
+#	/usr/lib64/collectd/check_uptime.so
+#	/usr/lib64/collectd/chrony.so
+#	/usr/lib64/collectd/connectivity.so
+#	/usr/lib64/collectd/cpusleep.so
+#	/usr/lib64/collectd/drbd.so
+#	/usr/lib64/collectd/fhcount.so
+#	/usr/lib64/collectd/gps.so
+#	/usr/lib64/collectd/hugepages.so
+#	/usr/lib64/collectd/ipc.so
+#	/usr/lib64/collectd/log_logstash.so
+#	/usr/lib64/collectd/lua.so
+#	/usr/lib64/collectd/lvm.so
+#	/usr/lib64/collectd/mcelog.so
+#	/usr/lib64/collectd/mqtt.so
+#	/usr/lib64/collectd/notify_nagios.so
+#	/usr/lib64/collectd/openldap.so
+#	/usr/lib64/collectd/ovs_events.so
+#	/usr/lib64/collectd/ovs_stats.so
+#	/usr/lib64/collectd/pinba.so
+#	/usr/lib64/collectd/procevent.so
+#	/usr/lib64/collectd/redis.so
+#	/usr/lib64/collectd/smart.so
+#	/usr/lib64/collectd/snmp_agent.so
+#	/usr/lib64/collectd/statsd.so
+#	/usr/lib64/collectd/synproxy.so
+#	/usr/lib64/collectd/sysevent.so
+#	/usr/lib64/collectd/tail_csv.so
+#	/usr/lib64/collectd/turbostat.so
+#	/usr/lib64/collectd/write_kafka.so
+#	/usr/lib64/collectd/write_log.so
+#	/usr/lib64/collectd/write_prometheus.so
+#	/usr/lib64/collectd/write_redis.so
+#	/usr/lib64/collectd/write_sensu.so
+#	/usr/lib64/collectd/write_stackdriver.so
+#	/usr/lib64/collectd/write_syslog.so
+#	/usr/lib64/collectd/write_tsdb.so
+#	/usr/lib64/collectd/xencpu.so
+#	/usr/lib64/collectd/zfs_arc.so
+#	/usr/lib64/collectd/zookeeper.so
+#	/usr/share/collectd/collection3/README
+#	/usr/share/collectd/collection3/bin/.htaccess
 #
 # - package contrib scripts as %doc
 # - perl modules with Collectd classes package to separate package
@@ -63,38 +98,65 @@
 #   mainstream library:
 # liboconfig  . . . . . yes (shipped version)
 # - Libraries not found by configure:
-#   libcredis . . . . . . no (credis.h not found) (http://code.google.com/p/credis/)
+#   intel mic . . . . . . no (MicAccessApi not found)
+#   libaquaero5 . . . . . no (libaquaero5.h not found)
+#   libdpdk . . . . . . . no (rte_config.h not found)
 #   libganglia  . . . . . no (gm_protocol.h not found) (http://ganglia.info/)
+#   libgrpc++ . . . . . . no (pkg-config could not find libgrpc++)
 #   libiokit  . . . . . . no (Darwin only)
-#   libjvm  . . . . . . . no (javac not found)
+#   libjevents  . . . . . no (jevents.h not found)
+#   libjvm  . . . . . . . no (javac/jar not found)
 #   libkstat  . . . . . . no (Solaris only)
 #   libkvm  . . . . . . . no (BSD only)
+#   liblvm2app  . . . . . no (lvm2app.h not found)
+#   libmongoc . . . . . . no (pkg-config could not find libmongoc)
 #   libnetapp . . . . . . no (netapp_api.h not found) (properitary)
+#   libnvidia-ml  . . . . no
+#   libowcapi . . . . . . no (owcapi.h not found)
 #   libperfstat . . . . . no (AIX only)
+#   libpqos . . . . . . . no (pqos.h not found)
+#   libqpid-proton .  . . no (proton/proactor.h not found)
 #   librabbitmq . . . . . no (amqp.h not found) (http://hg.rabbitmq.com/rabbitmq-c/)
+#   libriemann-client . . no (pkg-config doesn't know libriemann-client)
 #   librouteros . . . . . no ('routeros_api.h' not found) (http://verplant.org/librouteros/)
+#   libsigrok   . . . . . no (pkg-config could not find libsigrok)
 #   libtokyotyrant  . . . no (tcrdb.h not found) (http://1978th.net/tokyotyrant/)
 #   libyajl . . . . . . . no (yajl/yajl_parse.h not found)
 #   protobuf-c  . . . . . no
 #   oracle  . . . . . . . no (ORACLE_HOME is not set)
 # - Disabled modules (build most of them an package):
 #   amqp    . . . . . . . no
+#   amqp1   . . . . . . . no (proton/proactor.h not found)
 #   apple_sensors . . . . no             (Darwin only)
-#   gmond . . . . . . . . no
+#   aquaero . . . . . . . no (libaquaero5.h not found)
+#   dpdkevents. . . . . . no
+#   dpdkstat  . . . . . . no
+#   gmond . . . . . . . . no (gm_protocol.h not found)
+#   gpu_nvidia  . . . . . no
+#   grpc  . . . . . . . . no (libgrpc++ not found)
+#   intel_pmu . . . . . . no (jevents.h not found)
+#   intel_rdt . . . . . . no (pqos.h not found)
 #   ipvs  . . . . . . . . no             (ip_vs.h not found - llh to be fixed)
-#   java  . . . . . . . . no
-#   lpar... . . . . . . . no
+#   java  . . . . . . . . no (jar not found)
+#   lpar... . . . . . . . no (AIX only)
+#   lvm . . . . . . . . . no (lvm2app.h not found)
+#   mic . . . . . . . . . no (MicAccessApi not found)
 #   multimeter  . . . . . no             ?
-#   netapp  . . . . . . . no
-#   onewire . . . . . . . no             (needs libowfs)
-#   oracle  . . . . . . . no
+#   netapp  . . . . . . . no (netapp_api.h not found)
+#   onewire . . . . . . . no (owcapi.h not found)
+#   oracle  . . . . . . . no (ORACLE_HOME is not set)
+#   pf  . . . . . . . . . no
 #   pinba . . . . . . . . no
 #   redis . . . . . . . . no
-#   routeros  . . . . . . no
+#   routeros  . . . . . . no (routeros_api.h not found)
+#   sigrok  . . . . . . . no (pkg-config could not find libsigrok)
 #   tape  . . . . . . . . no             ?
-#   tokyotyrant . . . . . no
+#   tokyotyrant . . . . . no (tcrdb.h not found)
+#   write_mongodb . . . . no (pkg-config could not find libmongoc)
+#   write_riemann . . . . no (pkg-config doesn't know libriemann-client)
 #   write_redis . . . . . no
 #   zfs_arc . . . . . . . no
+#   zone  . . . . . . . . no
 # - logrotate file for logfile plugin
 # - %desc -l pl for plugins
 # - package SpamAssassin plugin from contrib
@@ -125,12 +187,13 @@
 Summary:	Collects system information in RRD files
 Summary(pl.UTF-8):	Zbieranie informacji o systemie w plikach RRD
 Name:		collectd
-Version:	5.6.1
-Release:	5
+Version:	5.9.2
+Release:	9
 License:	GPL v2
 Group:		Daemons
-Source0:	http://collectd.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5:	979f43b6439d7df93f0b40c73d779223
+# http://collectd.org/files/%{name}-%{version}.tar.bz2 is xz compressed :/
+Source0:	%{name}-%{version}.tar.xz
+# Source0-md5:	4ec308f256a3d3575f6c8a2be4338966
 Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}-http.conf
@@ -139,7 +202,7 @@ Source5:	%{name}-apache.conf
 Source10:	%{name}-df.conf
 Source11:	%{name}-rrdtool.conf
 Patch0:		%{name}-collection.patch
-Patch1:		compile.patch
+Patch1:		glibc-2.36.patch
 Patch2:		noquote.patch
 URL:		http://collectd.org/
 %{?with_ipmi:BuildRequires:	OpenIPMI-devel >= 2.0.14-3}
@@ -162,6 +225,7 @@ BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 %{?with_libvirt:BuildRequires:	libvirt-devel}
 %{?with_xml:BuildRequires:	libxml2-devel}
+BuildRequires:	linux-libc-headers
 %{?with_sensors:BuildRequires:	lm_sensors-devel}
 %{?with_mysql:BuildRequires:	mysql-devel}
 BuildRequires:	ncurses-devel
@@ -171,6 +235,8 @@ BuildRequires:	ncurses-devel
 BuildRequires:	perl-devel
 BuildRequires:	pkgconfig
 %{?with_pgsql:BuildRequires:	postgresql-devel}
+BuildRequires:	protobuf-c
+BuildRequires:	protobuf-devel
 BuildRequires:	python-devel
 BuildRequires:	python-modules
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -228,6 +294,7 @@ Summary:	Header files for %{name} libraries
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek %{name}
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
+Obsoletes:	collectd-static < 5.8.0
 
 %description devel
 Header files for %{name} libraries.
@@ -235,18 +302,6 @@ Header files for %{name} libraries.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe bibliotek %{name}.
 
-%package static
-Summary:	Static files for %{name} libraries
-Summary(pl.UTF-8):	Pliki statyczne bibliotek %{name}
-Group:		Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-
-%description static
-Static files for %{name} libraries.
-
-%description static -l pl.UTF-8
-Pliki statyczne bibliotek %{name}.
-
 %package apache
 Summary:	apache-plugin for collectd
 Summary(pl.UTF-8):	Wtyczka apache dla collectd
@@ -1327,8 +1382,9 @@ Perl files from Collectd package
 %{__automake}
 
 %configure \
-	CPPFLAGS="-Wno-unused-but-set-variable" \
+	CPPFLAGS="-Wno-unused-but-set-variable -Wno-format-truncation" \
 	c_cv_have_libperl=yes \
+	--disable-werror \
 	--with-libiptc=/usr \
 	--with-libstatgrab=/usr \
 	--with-lm-sensors=/usr \
@@ -1545,7 +1601,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO contrib
+%doc AUTHORS ChangeLog README contrib
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 %dir %{_sysconfdir}/%{name}.d
 %dir %{_webappdir}
@@ -1553,16 +1609,19 @@ fi
 %attr(755,root,root) %{_sbindir}/collectdmon
 %attr(755,root,root) %{_bindir}/collectdctl
 %attr(755,root,root) %{_bindir}/collectd-nagios
+%attr(755,root,root) %{_bindir}/collectd-tg
 %dir %{_libdir}/%{name}
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/types.db
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %{_mandir}/man1/collectd.1*
 %{_mandir}/man1/collectd-nagios.1*
+%{_mandir}/man1/collectd-tg.1*
 %{_mandir}/man1/collectdctl.1*
 %{_mandir}/man1/collectdmon.1*
 %{_mandir}/man5/collectd.conf.5*
 %{_mandir}/man5/collectd-java.5*
+%{_mandir}/man5/collectd-lua.5*
 %{_mandir}/man5/types.db.5*
 %dir %{_var}/lib/%{name}
 
@@ -1579,11 +1638,6 @@ fi
 %{_includedir}/%{name}/*.h
 %{_pkgconfigdir}/libcollectdclient.pc
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libcollectdclient.a
-%{_libdir}/%{name}/*.a
-
 %files collection
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/collection.conf