- fixed BRs against dns and netlink bconds, %files dns as well, cosmetics

[packages/collectd.git] / collectd.spec

diff --git a/collectd.spec b/collectd.spec
index 93a89a4f373774042ad4a33c85f1f0f167f7854b..84c7dbe70b74fc2ddc1b13e7d3e1fd72772706a0 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -13,8 +13,8 @@
 # - %desc -l pl for plugins
 #
 # Conditional build:
-%bcond_without dns             # ???
-%bcond_without ipmi            # ipmi plugin package
+%bcond_without dns             # DNS plugin
+%bcond_without ipmi            # IPMI plugin
 %bcond_without iptables        # iptables plugin
 %bcond_with    multimeter      # multimeter plugin
 %bcond_without netlink         # netlink plugin
@@ -28,7 +28,7 @@ Summary:      Collects system information in RRD files
 Summary(pl.UTF-8):     Zbieranie informacji o systemie w plikach RRD
 Name:          collectd
 Version:       4.6.2
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Daemons
 Source0:       http://collectd.org/files/%{name}-%{version}.tar.gz
@@ -48,10 +48,10 @@ BuildRequires:      curl-devel
 BuildRequires: hal-devel
 %{?with_iptables:BuildRequires:        iptables-devel >= 1.4.1.1-4}
 BuildRequires: libesmtp-devel
-BuildRequires: libnetlink-devel
+%{?with_netlink:BuildRequires: libnetlink-devel}
 BuildRequires: libnotify-devel
 BuildRequires: liboping-devel
-BuildRequires: libpcap-devel
+%{?with_dns:BuildRequires:     libpcap-devel}
 BuildRequires: libstatgrab-devel >= 0.12
 BuildRequires: libtool
 BuildRequires: libxml2-devel
@@ -96,9 +96,9 @@ 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
-Summary(pl.UTF-8):      Biblioteki %{name} 
-Group:          Libraries
+Summary:       %{name} libraries
+Summary(pl.UTF-8):     Biblioteki %{name}
+Group:         Libraries
 
 %description libs
 %{name} libraries.
@@ -107,10 +107,10 @@ Group:          Libraries
 Biblioteki %{name}.
 
 %package devel
-Summary:        Header files for %{name} libraries
-Summary(pl.UTF-8):      Pliki nagłówkowe bibliotek %{name} 
-Group:          Development/Libraries
-Requires:       %{name}-libs = %{version}-%{release}
+Summary:       Header files for %{name} libraries
+Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek %{name}
+Group:         Development/Libraries
+Requires:      %{name}-libs = %{version}-%{release}
 
 %description devel
 Header files for %{name} libraries.
@@ -840,10 +840,10 @@ This plugin collectd data provided by XMMS.
        --with-libstatgrab=/usr \
        --with-lm-sensors=/usr \
        --with-libmysql=/usr \
-       --%{?with_ipmi:en}%{!?with_ipmi:dis}able-ipmi \
-       --%{?with_multimeter:en}%{!?with_multimeter:dis}able-multimeter \
        --%{?with_dns:en}%{!?with_dns:dis}able-dns \
+       --%{?with_ipmi:en}%{!?with_ipmi:dis}able-ipmi \
        --%{?with_iptables:en}%{!?with_iptables:dis}able-iptables \
+       --%{?with_multimeter:en}%{!?with_multimeter:dis}able-multimeter \
        --%{?with_netlink:en}%{!?with_netlink:dis}able-netlink \
        --disable-ipvs \
        --disable-libvirt \
@@ -1018,6 +1018,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcollectdclient.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcollectdclient.so.0
+%dir %{_libdir}/%{name}
 
 %files devel
 %defattr(644,root,root,755)
@@ -1039,21 +1040,21 @@ fi
 %attr(755,root,root) %{_appdir}/cgi-bin/collection.cgi
 
 ########## PLUGINS:
+%files apache
+%defattr(640,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/apache.conf
+%attr(755,root,root) %{_libdir}/%{name}/apache.so
+
 %files apcups
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/apcups.conf
 %attr(755,root,root) %{_libdir}/%{name}/apcups.so
 
 %files ascent
-%defattr(644,root,root,755)
+%defattr(640,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/ascent.conf
 %attr(755,root,root) %{_libdir}/%{name}/ascent.so
 
-%files apache
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/apache.conf
-%attr(755,root,root) %{_libdir}/%{name}/apache.so
-
 %files battery
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/battery.conf
@@ -1080,12 +1081,12 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/csv.so
 
 %files curl
-%defattr(644,root,root,755)
+%defattr(640,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/curl.conf
 %attr(755,root,root) %{_libdir}/%{name}/curl.so
 
 %files dbi
-%defattr(644,root,root,755)
+%defattr(640,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/dbi.conf
 %attr(755,root,root) %{_libdir}/%{name}/dbi.so
 
@@ -1099,10 +1100,12 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/disk.conf
 %attr(755,root,root) %{_libdir}/%{name}/disk.so
 
+%if %{with dns}
 %files dns
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/dns.conf
 %attr(755,root,root) %{_libdir}/%{name}/dns.so
+%endif
 
 %files email
 %defattr(644,root,root,755)
@@ -1203,7 +1206,7 @@ fi
 %endif
 
 %files mysql
-%defattr(644,root,root,755)
+%defattr(640,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/mysql.conf
 %attr(755,root,root) %{_libdir}/%{name}/mysql.so
 
@@ -1225,7 +1228,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/nfs.so
 
 %files nginx
-%defattr(644,root,root,755)
+%defattr(640,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/nginx.conf
 %attr(755,root,root) %{_libdir}/%{name}/nginx.so
 
@@ -1235,7 +1238,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/notify_desktop.so
 
 %files notify_email
-%defattr(644,root,root,755)
+%defattr(640,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/notify_email.conf
 %attr(755,root,root) %{_libdir}/%{name}/notify_email.so
 
@@ -1260,9 +1263,10 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/ping.so
 
 %files postgresql
-%defattr(644,root,root,755)
+%defattr(640,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/postgresql.conf
 %attr(755,root,root) %{_libdir}/%{name}/postgresql.so
+%{_datadir}/%{name}/postgresql_default.conf
 
 %files powerdns
 %defattr(644,root,root,755)