- release 4

[packages/collectd.git] / collectd.spec

diff --git a/collectd.spec b/collectd.spec
index abb827165c0cc62c6385592c4f79a6b6720f5b0d..c0528db04573db2141261c7404c8e378c8e84bcc 100644 (file)
--- 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:       3
+Version:       5.0.1
+Release:       4
 License:       GPL v2
 Group:         Daemons
 Source0:       http://collectd.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 7bfea6e82d35b36f16d1da2c71397213
+# Source0-md5: 9ad1e4334bd4a671284e8e92a3e3323e
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}-http.conf
@@ -81,16 +81,14 @@ 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
 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}
@@ -99,7 +97,7 @@ BuildRequires:        libmemcached-devel
 BuildRequires: libnetlink-devel
 %{?with_netlink:BuildRequires: libnetlink-devel}
 %{?with_libvirt:BuildRequires: libnl1-devel}
-%{?with_notify:BuildRequires:  libnotify-devel >= 0.7.0}
+%{?with_notify:BuildRequires:  libnotify-devel}
 %{?with_ping:BuildRequires:    liboping-devel}
 %{?with_dns:BuildRequires:     libpcap-devel}
 BuildRequires: libstatgrab-devel >= 0.12
@@ -126,6 +124,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)
 
@@ -270,8 +269,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
@@ -1200,8 +1201,7 @@ Perl files from Collectd package
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch4 -p0
 
 %build
 %{__libtoolize}
@@ -1213,6 +1213,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 \
@@ -1252,7 +1253,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
@@ -1268,6 +1269,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
@@ -1283,6 +1287,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
@@ -1421,6 +1426,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
@@ -1458,7 +1464,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
@@ -1469,7 +1474,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}
@@ -1969,3 +1981,4 @@ fi
 %defattr(644,root,root,755)
 %{perl_vendorlib}/Collectd.pm
 %{perl_vendorlib}/Collectd
+%{_mandir}/man3/*.3*