Author: sparky Date: Fri Feb 5 01:36:29 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- BR: libmemcached-devel, libnetlink-devel, ncurses-devel, pkgconfig,
python-devel, python-modules, which
- psql bcond renamed to much more common pgsql
---- Files affected:
packages/collectd:
collectd.spec (1.82 -> 1.83)
---- Diffs:
================================================================
Index: packages/collectd/collectd.spec
diff -u packages/collectd/collectd.spec:1.82
packages/collectd/collectd.spec:1.83
--- packages/collectd/collectd.spec:1.82 Fri Feb 5 00:39:16 2010
+++ packages/collectd/collectd.spec Fri Feb 5 02:36:24 2010
@@ -53,7 +53,7 @@
%bcond_without netlink # netlink plugin
%bcond_without notify # notify_desktop plugin
%bcond_without ping # ping plugin
-%bcond_without psql # PostgreSQL plugin
+%bcond_without pgsql # PostgreSQL plugin
%bcond_without rrd # rrdtool and rrdcached plugins
%bcond_without sensors # sensors plugin
%bcond_without snmp # SNMP plugin
@@ -93,6 +93,8 @@
BuildRequires: libdbi-devel
%{?with_libesmtp:BuildRequires: libesmtp-devel}
BuildRequires: libltdl-devel
+BuildRequires: libmemcached-devel
+BuildRequires: libnetlink-devel
%{?with_netlink:BuildRequires: libnetlink-devel}
%{?with_notify:BuildRequires: libnotify-devel}
%{?with_ping:BuildRequires: liboping-devel}
@@ -103,12 +105,18 @@
%{?with_xml:BuildRequires: libxml2-devel}
%{?with_sensors:BuildRequires: lm_sensors-devel}
%{?with_mysql:BuildRequires: mysql-devel}
+BuildRequires: ncurses-devel
%{?with_snmp:BuildRequires: net-snmp-devel}
%{?with_ups:BuildRequires: nut-devel}
BuildRequires: perl-devel
-%{?with_psql:BuildRequires: postgresql-devel}
+BuildRequires: pkgconfig
+%{?with_pgsql:BuildRequires: postgresql-devel}
+BuildRequires: python-devel
+BuildRequires: python-modules
BuildRequires: rpmbuild(macros) >= 1.268
%{?with_rrd:BuildRequires: rrdtool-devel}
+BuildRequires: which
+#BuildRequires: xfsprogs-devel
%{?with_xmms:BuildRequires: xmms-devel}
Requires(post,preun): /sbin/chkconfig
Requires: rc-scripts
@@ -1106,7 +1114,7 @@
--%{?with_libesmtp:en}%{!?with_libesmtp:dis}able-notify_email \
--%{?with_ups:en}%{!?with_ups:dis}able-nut \
--%{?with_ping:en}%{!?with_ping:dis}able-ping \
- --%{?with_psql:en}%{!?with_psql:dis}able-postgresql \
+ --%{?with_pgsql:en}%{!?with_pgsql:dis}able-postgresql \
--%{?with_rrd:en}%{!?with_rrd:dis}able-rrdtool \
--%{?with_sensors:en}%{!?with_sensors:dis}able-sensors \
--%{?with_snmp:en}%{!?with_snmp:dis}able-snmp \
@@ -1496,7 +1504,7 @@
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}.d/madwifi.conf
%attr(755,root,root) %{_libdir}/%{name}/madwifi.so
-
+
%files match_empty_counter
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}.d/match_empty_counter.conf
@@ -1618,7 +1626,7 @@
%attr(755,root,root) %{_libdir}/%{name}/ping.so
%endif
-%if %{with psql}
+%if %{with pgsql}
%files postgresql
%defattr(640,root,root,755)
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}.d/postgresql.conf
@@ -1793,6 +1801,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.83 2010/02/05 01:36:24 sparky
+- BR: libmemcached-devel, libnetlink-devel, ncurses-devel, pkgconfig,
+ python-devel, python-modules, which
+- psql bcond renamed to much more common pgsql
+
Revision 1.82 2010/02/04 23:39:16 blues
- 4.9.1 - new plugins and more to be packaged. BRs are missing.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/collectd/collectd.spec?r1=1.82&r2=1.83&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
