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

Changed files:
    collectd.spec -> 1.63

diff --git a/collectd.spec b/collectd.spec
index c865a3fd0f020c074bd3a8310fed3c1cead3e94d..84c7dbe70b74fc2ddc1b13e7d3e1fd72772706a0 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -13,8 +13,8 @@
 # - %desc -l pl for plugins
 #
 # Conditional build:
 # - %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
 %bcond_without iptables        # iptables plugin
 %bcond_with    multimeter      # multimeter plugin
 %bcond_without netlink         # netlink plugin


@@ -48,10 +48,10 @@ BuildRequires:      curl-devel
 BuildRequires: hal-devel
 %{?with_iptables:BuildRequires:        iptables-devel >= 1.4.1.1-4}
 BuildRequires: libesmtp-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: libnotify-devel
 BuildRequires: liboping-devel

-BuildRequires: libpcap-devel
+%{?with_dns:BuildRequires:     libpcap-devel}

 BuildRequires: libstatgrab-devel >= 0.12
 BuildRequires: libtool
 BuildRequires: libxml2-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
 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.
 
 %description libs
 %{name} libraries.


@@ -107,10 +107,10 @@ Group:          Libraries
 Biblioteki %{name}.
 
 %package devel
 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.
 
 %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-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_dns:en}%{!?with_dns:dis}able-dns \

+       --%{?with_ipmi:en}%{!?with_ipmi:dis}able-ipmi \

        --%{?with_iptables:en}%{!?with_iptables:dis}able-iptables \
        --%{?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 \
        --%{?with_netlink:en}%{!?with_netlink:dis}able-netlink \
        --disable-ipvs \
        --disable-libvirt \


@@ -1100,10 +1100,12 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/disk.conf
 %attr(755,root,root) %{_libdir}/%{name}/disk.so
 
 %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
 %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)
 
 %files email
 %defattr(644,root,root,755)