Author: gotar Date: Mon Mar 30 00:32:30 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fixed BRs against dns and netlink bconds, %files dns as well, cosmetics
---- Files affected:
SPECS:
collectd.spec (1.62 -> 1.63)
---- Diffs:
================================================================
Index: SPECS/collectd.spec
diff -u SPECS/collectd.spec:1.62 SPECS/collectd.spec:1.63
--- SPECS/collectd.spec:1.62 Fri Mar 27 23:19:28 2009
+++ SPECS/collectd.spec Mon Mar 30 02:32:24 2009
@@ -14,8 +14,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
@@ -49,10 +49,10 @@
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
@@ -97,9 +97,9 @@
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.
@@ -108,10 +108,10 @@
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.
@@ -841,10 +841,10 @@
--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 \
@@ -1101,10 +1101,12 @@
%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)
@@ -1385,6 +1387,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.63 2009/03/30 00:32:24 gotar
+- fixed BRs against dns and netlink bconds, %files dns as well, cosmetics
+
Revision 1.62 2009/03/27 22:19:28 gotar
- o-r for config files having (optional) password inside
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/collectd.spec?r1=1.62&r2=1.63&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
