X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcollectd.git;a=blobdiff_plain;f=collectd.spec;h=e4f6053dbcaae49b9ffa2712593949939900ebe4;hp=875ac16610c975d69f67bbedff726870ae260e77;hb=f26b05dfce6f77cd6fb186952458acb4befaee75;hpb=d94da88b5b79758f0ebde7efcc0f61aa0fa6fcdd diff --git a/collectd.spec b/collectd.spec index 875ac16..e4f6053 100644 --- a/collectd.spec +++ b/collectd.spec @@ -1,18 +1,3 @@ -# TODO: -# - package contrib scripts as %doc -# - perl modules with Collectd classes package to separate package -# - Disabled modules: -# apple_sensors . . . no (obvious) -# ipvs . . . . . . . no (ip_vs.h not found - llh to be fixed) -# libvirt . . . . . . no (requires library) -# multimeter . . . . no ? -# onewire . . . . . . no (needs libowfs) -# perl . . . . . . . no (buggy perl: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072) -# rrdcached . . . . . no (requires rrdtool >= 1.4.0) -# tape . . . . . . . no ? -# - logrotate file for logfile plugin -# - %desc -l pl for plugins -# # Conditional build: %bcond_without curl # apache, ascent, bind, curl and nginx plugins %bcond_without dns # DNS plugin @@ -31,21 +16,22 @@ %bcond_without ups # nut plugin %bcond_without xml # ascent, bind and libvirt plugins %bcond_without xmms # XMMS plugin -# -#http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=358637 + +# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=358637 %ifarch %{x8664} %undefine with_iptables %undefine with_netlink %endif + Summary: Collects system information in RRD files Summary(pl.UTF-8): Zbieranie informacji o systemie w plikach RRD Name: collectd -Version: 4.7.0 -Release: 1 +Version: 4.7.1 +Release: 1.1 License: GPL v2 Group: Daemons Source0: http://collectd.org/files/%{name}-%{version}.tar.bz2 -# Source0-md5: 8740670913a7740f976122f3070e592b +# Source0-md5: 20e95914219a32bfd51d01333dbb7c01 Source1: %{name}.conf Source2: %{name}.init Source3: %{name}-http.conf @@ -53,12 +39,12 @@ Source4: %{name}-lighttpd.conf Source10: %{name}-df.conf Source11: %{name}-rrdtool.conf Patch0: %{name}-collection.patch +Patch1: %{name}-as_needed.patch URL: http://collectd.org/ %{?with_ipmi:BuildRequires: OpenIPMI-devel >= 2.0.14-3} BuildRequires: autoconf BuildRequires: automake %{?with_curl:BuildRequires: curl-devel} -BuildRequires: gcc-c++ BuildRequires: hal-devel %{?with_iptables:BuildRequires: iptables-devel >= 1.4.1.1-4} BuildRequires: libdbi-devel @@ -69,16 +55,17 @@ BuildRequires: libltdl-devel %{?with_ping:BuildRequires: liboping-devel} %{?with_dns:BuildRequires: libpcap-devel} BuildRequires: libstatgrab-devel >= 0.12 +BuildRequires: libstdc++-devel BuildRequires: libtool %{?with_xml:BuildRequires: libxml2-devel} %{?with_sensors:BuildRequires: lm_sensors-devel} %{?with_mysql:BuildRequires: mysql-devel} +%{?with_snmp:BuildRequires: net-snmp-devel} %{?with_ups:BuildRequires: nut-devel} BuildRequires: perl-devel %{?with_psql:BuildRequires: postgresql-devel} BuildRequires: rpmbuild(macros) >= 1.268 %{?with_rrd:BuildRequires: rrdtool-devel} -%{?with_snmp:BuildRequires: net-snmp-devel} %{?with_xmms:BuildRequires: xmms-devel} Requires(post,preun): /sbin/chkconfig Requires: rc-scripts @@ -101,15 +88,15 @@ every time new values should be logged. This allows collectd to have a 10 second resolution while being nice to the system. %description -l pl.UTF-8 -collectd to mały demon zbierający co 10 sekund informacje o systemie i -zapisujący wyniki do pliku RRD. +collectd to mały demon zbierający co 10 sekund informacje o systemie +i zapisujący wyniki do pliku RRD. W odróżnieniu od innych podobnych programów collectd nie jest skryptem, lecz jest napisany w czystym C z myślą o wydajności i przenośności. Jako demon pozostaje w pamięci, więc nie ma potrzeby -urychamiania ciężkiego interpretera za każdym razem, kiedy powinny być -zapisane nowe wartości. Dzięki temu collect może mieć rozdzielczość 10 -sekund i nie obciążać zbytnio systemu. +urychamiania ciężkiego interpretera za każdym razem, kiedy powinny +być zapisane nowe wartości. Dzięki temu collect może mieć +rozdzielczość 10 sekund i nie obciążać zbytnio systemu. %package libs Summary: %{name} libraries @@ -134,6 +121,18 @@ 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_PL.UTF-8): Wtyczka apache dla collectd @@ -141,7 +140,7 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description apache -This plugin collectd data provided by Apache's `mod_status'. +This plugin collect data provided by Apache's `mod_status'. %description apache -l pl.UTF-8 Wtyczka collectd zbierająca informacje udostępniane przez moduł @@ -182,10 +181,11 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description bind -Starting with BIND 9.5.0, the most widely used DNS server software provides -extensive statistics about queries, responses and lots of other information. -The bind plugin retrieves this information that's encoded in XML and provided -via HTTP and submits the values to collectd. +Starting with BIND 9.5.0, the most widely used DNS server software +provides extensive statistics about queries, responses and lots of +other information. The bind plugin retrieves this information that's +encoded in XML and provided via HTTP and submits the values to +collectd. %package collection Summary: Web script for collectd @@ -203,6 +203,20 @@ Suggests: fonts-TTF-DejaVu %description collection Web script for collectd. +%package collection3 +Summary: Web script for collectd +Summary(pl_PL.UTF-8): Web script for collectd +Group: Applications/WWW +Requires: %{name} = %{version}-%{release} +Requires: perl(Config::General) +Requires: perl(HTML::Entities) +Requires: perl(RRDs) +Requires: webserver(cgi) +Suggests: fonts-TTF-DejaVu + +%description collection3 +Web script for collectd. + %package conntrack Summary: conntrack-plugin for collectd Summary(pl_PL.UTF-8): Wtyczka conntrack dla collectd @@ -219,9 +233,9 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description cpu -The cpu-plugin collects the amount of time spent by the CPU in various states, -most notably executing user code, executing system code, waiting for IO -operations and being idle. +The cpu-plugin collects the amount of time spent by the CPU in various +states, most notably executing user code, executing system code, +waiting for IO operations and being idle. %package cpufreq Summary: cpufreq-plugin for collectd @@ -259,11 +273,12 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description dbi -This plugin uses the dbi library to connect to various databases, execute -SQL statements and read back the results. dbi is an acronym for "database -interface" in case you were wondering about the name. You can configure how -each column is to be interpreted and the plugin will generate one or more -data sets from each row returned according to these rules. +This plugin uses the dbi library to connect to various databases, +execute SQL statements and read back the results. dbi is an acronym +for "database interface" in case you were wondering about the name. +You can configure how each column is to be interpreted and the plugin +will generate one or more data sets from each row returned according +to these rules. %package df Summary: df-plugin for collectd @@ -272,10 +287,10 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description df -The df-plugin collects file system usage information, i. e. basically how -much space on a mounted partition is used and how much is available. It's -named after and very similar to the df(1) UNIX command that's been around -forever. +The df-plugin collects file system usage information, i. e. basically +how much space on a mounted partition is used and how much is +available. It's named after and very similar to the df(1) UNIX command +that's been around forever. %package disk Summary: disk-plugin for collectd @@ -295,9 +310,9 @@ Requires: %{name} = %{version}-%{release} Requires: perl-rrdtool %description dns -This plugin has a similar functionality to dnstop: It uses libpcap to get -a copy of all traffic from/to port UDP/53 (that's the DNS port), interprets -the packets and collects statistics of your DNS traffic. +This plugin has a similar functionality to dnstop: It uses libpcap to +get a copy of all traffic from/to port UDP/53 (that's the DNS port), +interprets the packets and collects statistics of your DNS traffic. %package email Summary: email-plugin for collectd @@ -307,12 +322,12 @@ Requires: %{name} = %{version}-%{release} %description email The email plugin opens an UNIX-socket over which one can submit email -statistics, such as the number of ``ham'', ``spam'', ``virus'', etc. mails -received/handled, spam scores and matched spam checks. +statistics, such as the number of ``ham'', ``spam'', ``virus'', etc. +mails received/handled, spam scores and matched spam checks. This plugin is intended to be used with the the -Mail::SpamAssassin::Plugin::Collectd manpage SpamAssassin-plugin which is -included in contrib/, but is of course not limited to that use. +Mail::SpamAssassin::Plugin::Collectd manpage SpamAssassin-plugin which +is included in contrib/, but is of course not limited to that use. %package entropy Summary: entropy-plugin for collectd @@ -340,11 +355,11 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description filecount -The filecount-plugin does something very simple: Count the number of files -in a directory and all its subdirectories. This can be used for a variety of -statistics, for example the queue length of an MTA, the number of PHP -sessions of a web server or simply the number of files in your home -directory. +The filecount-plugin does something very simple: Count the number of +files in a directory and all its subdirectories. This can be used for +a variety of statistics, for example the queue length of an MTA, the +number of PHP sessions of a web server or simply the number of files +in your home directory. %package fscache Summary: fscache-plugin for collectd @@ -353,8 +368,8 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description fscache -The fscache-plugin collects statistics about Linux file-system based caching -framework. +The fscache-plugin collects statistics about Linux file-system based +caching framework. %package hddtemp Summary: hddtemp-plugin for collectd @@ -364,8 +379,8 @@ Requires: %{name} = %{version}-%{release} Suggests: hddtemp-hddtempd %description hddtemp -Temperature of harddisks. The temperatures are provided via S.M.A.R.T. and -queried by the external hddtemp-daemon. +Temperature of harddisks. The temperatures are provided via S.M.A.R.T. +and queried by the external hddtemp-daemon. %package interface Summary: interface-plugin for collectd @@ -374,8 +389,8 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description interface -The interface-plugin collects information about the traffic (octets), packets -and errors of interfaces. +The interface-plugin collects information about the traffic (octets), +packets and errors of interfaces. %package iptables Summary: iptables-plugin for collectd @@ -385,13 +400,14 @@ Requires: %{name} = %{version}-%{release} %description iptables With this plugin you can gather statistics from your ip_tables based -packetfilter (aka. firewall). It can collect the byte- and packet-counters -of selected rules and submit them to collectd. You can select rules that -should be collected wither by its position (e.g. "the fourth rule in the -INPUT queue in the filter table") or by its comment (using the COMMENT -match). This means that depending on your firewall layout you can collect -certain services (such as the amount of web-traffic), source or destination -hosts or networks, dropped packets and much more. +packetfilter (aka. firewall). It can collect the byte- and +packet-counters of selected rules and submit them to collectd. You can +select rules that should be collected wither by its position (e.g. +"the fourth rule in the INPUT queue in the filter table") or by its +comment (using the COMMENT match). This means that depending on your +firewall layout you can collect certain services (such as the amount +of web-traffic), source or destination hosts or networks, dropped +packets and much more. %package ipmi Summary: ipmi-plugin for collectd @@ -476,9 +492,10 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description memcached -The memcached plugin connects to a memcached daemon and collects the number -of connections and requests handled by the daemon, the CPU resources consumed, -number of items cached, number of threads, and bytes sent and received. +The memcached plugin connects to a memcached daemon and collects the +number of connections and requests handled by the daemon, the CPU +resources consumed, number of items cached, number of threads, and +bytes sent and received. %package memory Summary: memory-plugin for collectd @@ -503,6 +520,7 @@ Summary: mysql-plugin for collectd Summary(pl_PL.UTF-8): Moduł mysql dla collectd. Group: Daemons Requires: %{name} = %{version}-%{release} +Requires: mysql-client %description mysql MySQL querying plugin. This plugins provides data of issued commands, @@ -519,11 +537,11 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description netlink -This plugin will open a netlink socket to the Linux kernel and use it to get -statistics for interfaces, qdiscs, classes, and, if you can make use of it, -filters. Since in most setups many of the statistics this plugin can collect -aren't of interest, you can select which information to gather using the -configuration. +This plugin will open a netlink socket to the Linux kernel and use it +to get statistics for interfaces, qdiscs, classes, and, if you can +make use of it, filters. Since in most setups many of the statistics +this plugin can collect aren't of interest, you can select which +information to gather using the configuration. %package network Summary: network-plugin for collectd @@ -541,8 +559,8 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description nfs -The nfs plugin counts the number of procedure calls of the different NFS -procedures. +The nfs plugin counts the number of procedure calls of the different +NFS procedures. %package nginx Summary: nginx-plugin for collectd @@ -551,9 +569,10 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description nginx -This plugin collects the number of connections and requests handled by the -nginx daemon, a HTTP and mail server/proxy. It queries the page provided by -the ngx_http_stub_status_module module, which isn't compiled by default. +This plugin collects the number of connections and requests handled by +the nginx daemon, a HTTP and mail server/proxy. It queries the page +provided by the ngx_http_stub_status_module module, which isn't +compiled by default. %package notify_desktop Summary: notify_desktop for collectd @@ -563,9 +582,9 @@ Requires: %{name} = %{version}-%{release} %description notify_desktop This plugin sends a desktop notification to a notification daemon, as -defined in the Desktop Notification Specification. To actually display the -notifications, notification-daemon is required and collectd has to be able -to access the X server. +defined in the Desktop Notification Specification. To actually display +the notifications, notification-daemon is required and collectd has to +be able to access the X server. %package notify_email Summary: notify_email-plugin for collectd @@ -593,8 +612,8 @@ Requires: %{name} = %{version}-%{release} %description nut UPS statistics using the Network UPS Tools. These statistics include -basically everything NUT will give us, including voltages, currents, power, -frequencies, load, and temperatures. +basically everything NUT will give us, including voltages, currents, +power, frequencies, load, and temperatures. %package openvpn Summary: openvpn plugin for collectd @@ -604,22 +623,24 @@ Requires: %{name} = %{version}-%{release} Requires: openvpn %description openvpn -The OpenVPN plugin reads a status file maintained by OpenVPN and gathers -traffic statistics about connected clients. +The OpenVPN plugin reads a status file maintained by OpenVPN and +gathers traffic statistics about connected clients. %package ping Summary: ping-plugin for collectd Summary(pl_PL.UTF-8): Wtyczka ping dla collectd Group: Daemons Requires: %{name} = %{version}-%{release} +Requires: liboping >= 1.1.2 %description ping -The network latency is measured as a roundtrip time. An ICMP-echo-request -(aka. "ping")is sent to a host and the time needed for his echo-reply (aka. -"pong") to arrive is measured. If a reply is not received within one second -the plugin will no longer expect a reply and return. This may happen in -several circumstances, e. g. the packet is lost, the host is down, a router -has dismissed the packet, etc. +The network latency is measured as a roundtrip time. An +ICMP-echo-request (aka. "ping")is sent to a host and the time needed +for his echo-reply (aka. "pong") to arrive is measured. If a reply is +not received within one second the plugin will no longer expect a +reply and return. This may happen in several circumstances, e. g. the +packet is lost, the host is down, a router has dismissed the packet, +etc. %package postgresql Summary: mysql-plugin for collectd @@ -628,9 +649,9 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description postgresql -The postgresql plugin queries statistics from PostgreSQL databases. It keeps -a persistent connection to all configured databases and tries to reconnect -if the connection has been interrupted. +The postgresql plugin queries statistics from PostgreSQL databases. It +keeps a persistent connection to all configured databases and tries to +reconnect if the connection has been interrupted. %package powerdns Summary: powerdns-plugin for collectd @@ -640,9 +661,9 @@ Requires: %{name} = %{version}-%{release} %description powerdns The powerdns plugin queries statistics from an authoritative PowerDNS -nameserver and/or a PowerDNS recursor. Since both offer a wide variety of -values, many of which are probably meaningless to most users, but may be -useful for some. +nameserver and/or a PowerDNS recursor. Since both offer a wide variety +of values, many of which are probably meaningless to most users, but +may be useful for some. %package processes Summary: processes-plugin for collectd @@ -651,9 +672,9 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description processes -This plugin collects the number of processes, grouped by their state (e.g. -running, sleeping, zombies, etc.). In addition to that, it can select -detailed statistics about selected processes, grouped by name. +This plugin collects the number of processes, grouped by their state +(e.g. running, sleeping, zombies, etc.). In addition to that, it can +select detailed statistics about selected processes, grouped by name. %package protocols Summary: protocols-plugin for collectd @@ -662,8 +683,8 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description protocols -The protocols-plugin provides information about network protocols, such as -IP, TCP and UDP. +The protocols-plugin provides information about network protocols, +such as IP, TCP and UDP. %package rrdtool Summary: rrdtool-plugin for collectd @@ -683,8 +704,8 @@ Requires: %{name} = %{version}-%{release} %description sensors This plugin uses lm-sensors to read hardware sensors. You will need to -configure lm-sensors before this plugin will collect any usefull and correct -data. +configure lm-sensors before this plugin will collect any usefull and +correct data. %package serial Summary: serial-plugin for collectd @@ -703,10 +724,10 @@ Requires: %{name} = %{version}-%{release} %description snmp The snmp plugin queries other hosts using SNMP, the Simple Network -Management Protocol, and translates the value it receives to collectd's -internal format and dispatches them. Depending on the write plugins you have -loaded they may be written to disk or submitted to another instance or -whatever you configured. +Management Protocol, and translates the value it receives to +collectd's internal format and dispatches them. Depending on the write +plugins you have loaded they may be written to disk or submitted to +another instance or whatever you configured. %package swap Summary: swap-plugin for collectd @@ -770,9 +791,9 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description tail -The tail-plugin can be used to "tail" logfiles, i.e. follow them as tail -F -does. Each line is given to one or more "matches" which test if the line is -relevant for any statistics using a regular expression. +The tail-plugin can be used to "tail" logfiles, i.e. follow them as +tail -F does. Each line is given to one or more "matches" which test +if the line is relevant for any statistics using a regular expression. %package tcpconns Summary: tcpconns-plugin for collectd @@ -782,9 +803,9 @@ Requires: %{name} = %{version}-%{release} %description tcpconns The tcpconns-plugin counts the number of TCP connections to or from a -specified port. Typically the connectioins where you specify the local port -are incoming connections while the connections where you specify the remote -port are outgoing connections. +specified port. Typically the connectioins where you specify the local +port are incoming connections while the connections where you specify +the remote port are outgoing connections. %package teamspeak2 Summary: teamspeak2-plugin for collectd @@ -793,9 +814,10 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description teamspeak2 -The teamspeak2 plugin connects to the query port of a teamspeak2 server and -polls interesting global and virtual server data. The plugin can query only -one physical server but unlimited virtual servers. +The teamspeak2 plugin connects to the query port of a teamspeak2 +server and polls interesting global and virtual server data. The +plugin can query only one physical server but unlimited virtual +servers. %package ted Summary: ted-plugin for collectd @@ -804,8 +826,8 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description ted -The TED-plugin reads power consumption measurements from “The Energy Detective” -(TED). +The TED-plugin reads power consumption measurements from “The Energy +Detective” (TED). %package thermal Summary: thermal-plugin for collectd @@ -823,10 +845,10 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description unixsock -The unixsock plugin opens an UNIX-socket over which one can interact with -the daemon. This can be used to use the values collected by collectd in -other applications, such as monitoring, or submit externally collected -values to collectd. +The unixsock plugin opens an UNIX-socket over which one can interact +with the daemon. This can be used to use the values collected by +collectd in other applications, such as monitoring, or submit +externally collected values to collectd. %package uptime Summary: uptime-plugin for collectd @@ -853,11 +875,11 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description uuid -This plugin, if loaded, causes the Hostname to be taken from the machine's -UUID. The UUID is a universally unique designation for the machine, usually -taken from the machine's BIOS. This is most useful if the machine is -running in a virtual environment such as Xen, in which case the UUID is -preserved across shutdowns and migration. +This plugin, if loaded, causes the Hostname to be taken from the +machine's UUID. The UUID is a universally unique designation for the +machine, usually taken from the machine's BIOS. This is most useful if +the machine is running in a virtual environment such as Xen, in which +case the UUID is preserved across shutdowns and migration. %package vmem Summary: vmem-plugin for collectd @@ -866,9 +888,9 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description vmem -The vmem plugin collects information about the usage of virtual memory. -Since the statistics provided by the Linux kernel are very detailed, they -are collected very detailed. +The vmem plugin collects information about the usage of virtual +memory. Since the statistics provided by the Linux kernel are very +detailed, they are collected very detailed. %package vserver Summary: vserver-plugin for collectd @@ -877,8 +899,8 @@ Group: Daemons Requires: %{name} = %{version}-%{release} %description vserver -Collects information about the virtual servers running on a system, using -Linux-Vserver. +Collects information about the virtual servers running on a system, +using Linux-Vserver. %package wireless Summary: wireless-plugin for collectd @@ -898,9 +920,17 @@ Requires: %{name} = %{version}-%{release} %description xmms This plugin collectd data provided by XMMS. +%package -n perl-Collectd +Summary: Perl files from Collectd package +Group: Daemons + +%description -n perl-Collectd +Perl files from Collectd package + %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__libtoolize} @@ -937,12 +967,12 @@ This plugin collectd data provided by XMMS. %{__make} LDFLAGS="%{rpmldflags} -lstatgrab" \ BUILD_WITH_OPENIPMI_CFLAGS="-I/usr/include" \ - BUILD_WITH_OPENIPMI_LIBS="-L/usr/lib64 -lOpenIPMIutils -lOpenIPMIpthread" + BUILD_WITH_OPENIPMI_LIBS="-L%{_libdir} -lOpenIPMIutils -lOpenIPMIpthread" %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_var}/{log/,lib/%{name}},/etc/{rc.d/init.d/,collectd.d}} \ - $RPM_BUILD_ROOT{%{_appdir}/cgi-bin,%{_webappdir},%{_pkglibdir}} + $RPM_BUILD_ROOT{%{_appdir}/cgi-bin,%{_webappdir},%{_pkglibdir},%{perl_vendorlib}/} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -957,6 +987,8 @@ install %{SOURCE3} $RPM_BUILD_ROOT%{_webappdir}/apache.conf install %{SOURCE3} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf install %{SOURCE4} $RPM_BUILD_ROOT%{_webappdir}/lighttpd.conf +cp -R contrib/collection3 $RPM_BUILD_ROOT%{_appdir} + ### Configs instalation ### for i in `egrep "^(#|)LoadPlugin" src/collectd.conf |awk '{print $NF}' ` ; do egrep "LoadPlugin $i$" src/collectd.conf | %{__sed} -e "s/^#//" > $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/$i.conf @@ -970,6 +1002,8 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.conf install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/df.conf install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/rrdtool.conf +mv $RPM_BUILD_ROOT%{_datadir}/perl5/Collectd* $RPM_BUILD_ROOT%{perl_vendorlib}/ + # Cleanups: rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la @@ -1099,9 +1133,10 @@ fi %attr(754,root,root) /etc/rc.d/init.d/%{name} %{_mandir}/man1/collectd.1* %{_mandir}/man1/collectd-nagios.1* +%{_mandir}/man1/collectdmon.1* %{_mandir}/man5/collectd.conf.5* +%{_mandir}/man5/collectd-java.5* %{_mandir}/man5/collectd-perl.5* -%{_mandir}/man1/collectdmon.1* %{_mandir}/man5/types.db.5* %dir %{_var}/lib/%{name} @@ -1119,6 +1154,11 @@ 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) %dir %{_webappdir} @@ -1130,6 +1170,10 @@ fi %dir %{_appdir}/cgi-bin %attr(755,root,root) %{_appdir}/cgi-bin/collection.cgi +%files collection3 +%defattr(644,root,root,755) +%{_appdir}/collection3 + ########## PLUGINS: %if %{with xml} %if %{with curl} @@ -1290,6 +1334,7 @@ fi %files match_timediff %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/%{name}/match_timediff.so +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/match_timediff.conf %files match_value %defattr(644,root,root,755) @@ -1534,3 +1579,8 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/xmms.conf %attr(755,root,root) %{_libdir}/%{name}/xmms.so %endif + +%files -n perl-Collectd +%defattr(644,root,root,755) +%{perl_vendorlib}/Collectd.pm +%{perl_vendorlib}/Collectd