X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcollectd.git;a=blobdiff_plain;f=collectd.spec;h=3495357f6fb14e6dfcc829e7272e3990cb013f7d;hp=ae5c1f6fd59d7c5558a0f4afdeeab73740d9beaf;hb=86a1db882ee082e179b3337ec3b72d8ea6296e1c;hpb=7a3b7a2cb00a2ad1832c8c81deed6cc771e7c212 diff --git a/collectd.spec b/collectd.spec index ae5c1f6..3495357 100644 --- a/collectd.spec +++ b/collectd.spec @@ -67,12 +67,12 @@ Summary: Collects system information in RRD files Summary(pl.UTF-8): Zbieranie informacji o systemie w plikach RRD Name: collectd -Version: 5.0.0 -Release: 2 +Version: 5.0.2 +Release: 3 License: GPL v2 Group: Daemons Source0: http://collectd.org/files/%{name}-%{version}.tar.bz2 -# Source0-md5: 7bfea6e82d35b36f16d1da2c71397213 +# Source0-md5: 47f70ae20801f10be355dc8109d696aa Source1: %{name}.conf Source2: %{name}.init Source3: %{name}-http.conf @@ -81,16 +81,15 @@ Source10: %{name}-df.conf Source11: %{name}-rrdtool.conf Patch0: %{name}-collection.patch Patch1: compile.patch -Patch2: netfilter.patch -Patch3: libnotify.patch -Patch4: noquote.patch -Patch5: libiptc.patch +Patch2: noquote.patch +Patch3: libiptc.patch +Patch4: pld.patch +Patch5: %{name}-netlink.patch URL: http://collectd.org/ %{?with_ipmi:BuildRequires: OpenIPMI-devel >= 2.0.14-3} BuildRequires: autoconf BuildRequires: automake %{?with_curl:BuildRequires: curl-devel} -BuildRequires: hal-devel %{?with_iptables:BuildRequires: iptables-devel >= 1.4.1.1-4} BuildRequires: libdbi-devel %{?with_libesmtp:BuildRequires: libesmtp-devel} @@ -98,7 +97,8 @@ BuildRequires: libltdl-devel BuildRequires: libmemcached-devel BuildRequires: libnetlink-devel %{?with_netlink:BuildRequires: libnetlink-devel} -%{?with_notify:BuildRequires: libnotify-devel >= 0.7.0} +%{?with_libvirt:BuildRequires: libnl1-devel} +%{?with_notify:BuildRequires: libnotify-devel} %{?with_ping:BuildRequires: liboping-devel} %{?with_dns:BuildRequires: libpcap-devel} BuildRequires: libstatgrab-devel >= 0.12 @@ -110,6 +110,7 @@ BuildRequires: libtool %{?with_libvirt:BuildRequires: libvirt-devel} BuildRequires: ncurses-devel %{?with_snmp:BuildRequires: net-snmp-devel} +%{?with_libvirt:BuildRequires: numactl-devel} %{?with_ups:BuildRequires: nut-devel} BuildRequires: perl-devel BuildRequires: pkgconfig @@ -124,6 +125,7 @@ BuildRequires: which %{?with_xmms:BuildRequires: xmms-devel} BuildRequires: yajl-devel Requires(post,preun): /sbin/chkconfig +Requires: %{name}-libs = %{version}-%{release} Requires: rc-scripts BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -268,8 +270,10 @@ Summary: Web script for collectd Summary(pl.UTF-8): Web script for collectd Group: Applications/WWW Requires: %{name} = %{version}-%{release} +Requires: perl-Collectd = %{version}-%{release} Requires: perl(Config::General) Requires: perl(HTML::Entities) +Requires: perl(Regexp::Common) Requires: perl(RRDs) Requires: webserver(cgi) Suggests: fonts-TTF-DejaVu @@ -1198,7 +1202,7 @@ Perl files from Collectd package %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 +%patch4 -p0 %patch5 -p1 %build @@ -1211,6 +1215,7 @@ Perl files from Collectd package %configure \ CPPFLAGS="-Wno-unused-but-set-variable" \ c_cv_have_libperl=yes \ + --with-libiptc=/usr \ --with-libstatgrab=/usr \ --with-lm-sensors=/usr \ --with-libmysql=/usr \ @@ -1250,7 +1255,7 @@ Perl files from Collectd package %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},%{perl_vendorlib}/} + $RPM_BUILD_ROOT{%{_appdir}/cgi-bin,%{_webappdir},%{_pkglibdir},%{perl_vendorlib}/,%{_mandir}/man3} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -1266,6 +1271,9 @@ install %{SOURCE3} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf install %{SOURCE4} $RPM_BUILD_ROOT%{_webappdir}/lighttpd.conf cp -R contrib/collection3 $RPM_BUILD_ROOT%{_appdir} +mv $RPM_BUILD_ROOT%{_appdir}/collection3/etc/collection.conf $RPM_BUILD_ROOT%{_webappdir}/collection3.conf +ln -sf %{_webappdir}/collection3.conf $RPM_BUILD_ROOT%{_appdir}/collection3/etc/collection.conf +sed -i -e 's@#DataDir "/var/lib/collectd/rrd"@DataDir "%{_var}/lib/%{name}"@' $RPM_BUILD_ROOT%{_webappdir}/collection3.conf ### Configs instalation ### for i in `egrep "^(#|)LoadPlugin" src/collectd.conf |awk '{print $NF}' ` ; do @@ -1281,6 +1289,7 @@ 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}/ +mv $RPM_BUILD_ROOT/usr/man/man3/Collectd::Unixsock.3pm $RPM_BUILD_ROOT%{_mandir}/man3/ # Cleanups: rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la @@ -1419,6 +1428,7 @@ fi %doc AUTHORS ChangeLog README TODO contrib %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf %dir %{_sysconfdir}/%{name}.d +%dir %{_webappdir} %attr(755,root,root) %{_sbindir}/collectd %attr(755,root,root) %{_sbindir}/collectdmon %attr(755,root,root) %{_bindir}/collectdctl @@ -1456,7 +1466,6 @@ fi %files collection %defattr(644,root,root,755) -%dir %{_webappdir} %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/collection.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/apache.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/httpd.conf @@ -1467,7 +1476,14 @@ fi %files collection3 %defattr(644,root,root,755) -%{_appdir}/collection3 +%doc contrib/collection3/README +%config(noreplace) %verify(not md5 mtime size) %{_webappdir}/collection3.conf +%dir %{_appdir}/collection3 +%dir %{_appdir}/collection3/bin +%attr(755,root,root) %{_appdir}/collection3/bin/*.cgi +%{_appdir}/collection3/etc +%{_appdir}/collection3/lib +%{_appdir}/collection3/share ########## PLUGINS: %if %{with xml} @@ -1624,10 +1640,12 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/irq.conf %attr(755,root,root) %{_libdir}/%{name}/irq.so +%if %{with libvirt} %files libvirt %defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/libvirt.conf %attr(755,root,root) %{_libdir}/%{name}/libvirt.so +%endif %files load %defattr(644,root,root,755) @@ -1965,3 +1983,4 @@ fi %defattr(644,root,root,755) %{perl_vendorlib}/Collectd.pm %{perl_vendorlib}/Collectd +%{_mandir}/man3/*.3*