- up to 4.1.2, nfy

Changed files:
    collectd.spec -> 1.10

diff --git a/collectd.spec b/collectd.spec
index 6884408941c0bdf6ae4bb671aa76e9fc3282b034..c65008f9c74eaab5320716e4772f75e7573b2986 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,6 +1,6 @@
 # TODO:
 # TODO:

-# - mysql subpackage

 # - lm_sensors subpackage
 # - lm_sensors subpackage

+# - perl subpackage

 # - hddtemp subpackage
 # - initscripts for local/client/server mode (subpackage ?)
 # - collection CGI script
 # - hddtemp subpackage
 # - initscripts for local/client/server mode (subpackage ?)
 # - collection CGI script


@@ -8,14 +8,14 @@
 Summary:       Collects system information in RRD files
 Summary(pl.UTF-8):     Zbieranie informacji o systemie w plikach RRD
 Name:          collectd
 Summary:       Collects system information in RRD files
 Summary(pl.UTF-8):     Zbieranie informacji o systemie w plikach RRD
 Name:          collectd

-Version:       3.11.5
+Version:       4.1.2

 Release:       0.1
 License:       GPL v2
 Group:         Daemons
 Source0:       http://collectd.org/files/%{name}-%{version}.tar.gz
 Release:       0.1
 License:       GPL v2
 Group:         Daemons
 Source0:       http://collectd.org/files/%{name}-%{version}.tar.gz

-# Source0-md5: 5fc175cff3e3cd307965968d5398b8ff
+# Source0-md5: 40458dabe8ec5df87323c1862a03cb94

 Source1:       %{name}.conf
 Source1:       %{name}.conf

-Patch0:                %{name}-include.patch
+#Patch0:               %{name}-include.patch

 URL:           http://collectd.org/
 BuildRequires: autoconf
 BuildRequires: automake
 URL:           http://collectd.org/
 BuildRequires: autoconf
 BuildRequires: automake


@@ -24,6 +24,7 @@ BuildRequires:        libstatgrab-devel >= 0.12
 BuildRequires: libpcap-devel
 BuildRequires: libtool
 BuildRequires: mysql-devel
 BuildRequires: libpcap-devel
 BuildRequires: libtool
 BuildRequires: mysql-devel

+BuildRequires: perl-devel

 BuildRequires: rpmbuild(macros) >= 1.228
 BuildRequires: rrdtool-devel
 Requires(post,preun):  /sbin/chkconfig
 BuildRequires: rpmbuild(macros) >= 1.228
 BuildRequires: rrdtool-devel
 Requires(post,preun):  /sbin/chkconfig


@@ -50,11 +51,42 @@ 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.
 
 zapisane nowe wartości. Dzięki temu collect może mieć rozdzielczość 10
 sekund i nie obciążać zbytnio systemu.
 

+%package apache
+Summary:       apache-plugin for collectd.
+Summary(pl_PL.UTF-8):  moduł apache dla collectd.
+Group:         Daemons
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description apache
+This plugin collectd data provided by Apache's `mod_status'.
+
+%description apache -l pl.UTF-8
+Plugin collectd zbierający informacje udostępniane przez moduł 'mod_status' Apacha.
+
+%package mysql
+Summary:       mysql-plugin for collectd.
+Summary(pl_PL.UTF-8):  moduł mysql-plugin do collectd.
+Group:         Daemons
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description mysql
+MySQL  querying  plugin.  This plugins  provides data of  issued commands,
+called handlers and database traffic.
+
+%description mysql -l pl.UTF-8
+Moduł odpytujący MySQL. Wtyczka udostępnia dane z mysqla.
+

 %prep
 %setup -q
 %prep
 %setup -q

-%patch -p1
+#%patch -p1

 
 %build
 
 %build

+if [ -f version-gen.sh ]; then
+       echo zaktualizuj speca baranie
+else
+       echo "head -1 ChangeLog  |cut -f 3 -d ' ' |tr -d '\n' " > version-gen.sh
+       chmod a+rx version-gen.sh
+fi

 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}


@@ -94,33 +126,44 @@ fi
 %doc AUTHORS ChangeLog README TODO
 
 %attr(755,root,root) %{_sbindir}/collectd
 %doc AUTHORS ChangeLog README TODO
 
 %attr(755,root,root) %{_sbindir}/collectd

+%attr(755,root,root) %{_bindir}/collectd-nagios

 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}

-%attr(755,root,root) %{_libdir}/%{name}/apache.so

 %attr(755,root,root) %{_libdir}/%{name}/apcups.so
 %attr(755,root,root) %{_libdir}/%{name}/apcups.so

-%attr(755,root,root) %{_libdir}/%{name}/apple_sensors.so
+#%attr(755,root,root) %{_libdir}/%{name}/apple_sensors.so

 %attr(755,root,root) %{_libdir}/%{name}/battery.so
 %attr(755,root,root) %{_libdir}/%{name}/cpufreq.so
 %attr(755,root,root) %{_libdir}/%{name}/cpu.so
 %attr(755,root,root) %{_libdir}/%{name}/battery.so
 %attr(755,root,root) %{_libdir}/%{name}/cpufreq.so
 %attr(755,root,root) %{_libdir}/%{name}/cpu.so

+%attr(755,root,root) %{_libdir}/%{name}/csv.so

 %attr(755,root,root) %{_libdir}/%{name}/df.so
 %attr(755,root,root) %{_libdir}/%{name}/disk.so
 %attr(755,root,root) %{_libdir}/%{name}/dns.so
 %attr(755,root,root) %{_libdir}/%{name}/email.so
 %attr(755,root,root) %{_libdir}/%{name}/df.so
 %attr(755,root,root) %{_libdir}/%{name}/disk.so
 %attr(755,root,root) %{_libdir}/%{name}/dns.so
 %attr(755,root,root) %{_libdir}/%{name}/email.so

+%attr(755,root,root) %{_libdir}/%{name}/entropy.so
+%attr(755,root,root) %{_libdir}/%{name}/exec.so

 %attr(755,root,root) %{_libdir}/%{name}/hddtemp.so
 %attr(755,root,root) %{_libdir}/%{name}/hddtemp.so

+%attr(755,root,root) %{_libdir}/%{name}/interface.so
+%attr(755,root,root) %{_libdir}/%{name}/irq.so

 %attr(755,root,root) %{_libdir}/%{name}/load.so
 %attr(755,root,root) %{_libdir}/%{name}/load.so

+%attr(755,root,root) %{_libdir}/%{name}/logfile.so

 %attr(755,root,root) %{_libdir}/%{name}/mbmon.so
 %attr(755,root,root) %{_libdir}/%{name}/memory.so
 %attr(755,root,root) %{_libdir}/%{name}/multimeter.so
 %attr(755,root,root) %{_libdir}/%{name}/mbmon.so
 %attr(755,root,root) %{_libdir}/%{name}/memory.so
 %attr(755,root,root) %{_libdir}/%{name}/multimeter.so

-%attr(755,root,root) %{_libdir}/%{name}/mysql.so
+%attr(755,root,root) %{_libdir}/%{name}/network.so

 %attr(755,root,root) %{_libdir}/%{name}/nfs.so
 %attr(755,root,root) %{_libdir}/%{name}/ntpd.so
 %attr(755,root,root) %{_libdir}/%{name}/nfs.so
 %attr(755,root,root) %{_libdir}/%{name}/ntpd.so

+%attr(755,root,root) %{_libdir}/%{name}/perl.so

 %attr(755,root,root) %{_libdir}/%{name}/ping.so
 %attr(755,root,root) %{_libdir}/%{name}/processes.so
 %attr(755,root,root) %{_libdir}/%{name}/ping.so
 %attr(755,root,root) %{_libdir}/%{name}/processes.so

-%attr(755,root,root) %{_libdir}/%{name}/sensors.so
+%attr(755,root,root) %{_libdir}/%{name}/rrdtool.so
+#%attr(755,root,root) %{_libdir}/%{name}/sensors.so

 %attr(755,root,root) %{_libdir}/%{name}/serial.so
 %attr(755,root,root) %{_libdir}/%{name}/serial.so

+%attr(755,root,root) %{_libdir}/%{name}/syslog.so

 %attr(755,root,root) %{_libdir}/%{name}/swap.so
 %attr(755,root,root) %{_libdir}/%{name}/swap.so

-%attr(755,root,root) %{_libdir}/%{name}/tape.so
-%attr(755,root,root) %{_libdir}/%{name}/traffic.so
+%{_libdir}/%{name}/types.db
+#%attr(755,root,root) %{_libdir}/%{name}/tape.so
+#%attr(755,root,root) %{_libdir}/%{name}/traffic.so

 %attr(755,root,root) %{_libdir}/%{name}/users.so
 %attr(755,root,root) %{_libdir}/%{name}/users.so

+%attr(755,root,root) %{_libdir}/%{name}/unixsock.so

 %attr(755,root,root) %{_libdir}/%{name}/vserver.so
 %attr(755,root,root) %{_libdir}/%{name}/wireless.so
 
 %attr(755,root,root) %{_libdir}/%{name}/vserver.so
 %attr(755,root,root) %{_libdir}/%{name}/wireless.so
 


@@ -130,4 +173,18 @@ fi
 #%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 
 %{_mandir}/man1/collectd.1*
 #%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 
 %{_mandir}/man1/collectd.1*

+%{_mandir}/man1/collectd-nagios.1*

 %{_mandir}/man5/collectd.conf.5*
 %{_mandir}/man5/collectd.conf.5*

+%{_mandir}/man5/collectd-email.5*
+%{_mandir}/man5/collectd-exec.5*
+%{_mandir}/man5/collectd-perl.5*
+%{_mandir}/man5/collectd-snmp.5*
+%{_mandir}/man5/collectd-unixsock.5*
+
+%files apache
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/apache.so
+
+%files mysql
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/mysql.so