packages: collectd/collectd.spec, collectd/compile.patch (NEW) - added comp...

[sls]

Author: sls                          Date: Thu Apr  8 14:04:37 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added compile.patch

---- Files affected:
packages/collectd:
   collectd.spec (1.87 -> 1.88) , compile.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/collectd/collectd.spec
diff -u packages/collectd/collectd.spec:1.87 packages/collectd/collectd.spec:1.88
--- packages/collectd/collectd.spec:1.87	Sat Apr  3 19:18:04 2010
+++ packages/collectd/collectd.spec	Thu Apr  8 16:04:31 2010
@@ -81,6 +81,7 @@
 Source10:	%{name}-df.conf
 Source11:	%{name}-rrdtool.conf
 Patch0:		%{name}-collection.patch
+Patch1:		compile.patch
 URL:		http://collectd.org/
 %{?with_ipmi:BuildRequires:	OpenIPMI-devel >= 2.0.14-3}
 BuildRequires:	autoconf
@@ -1102,6 +1103,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -1817,6 +1819,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88  2010/04/08 14:04:31  sls
+- added compile.patch
+
 Revision 1.87  2010/04/03 17:18:04  glen
 - release 3
 

================================================================
Index: packages/collectd/compile.patch
diff -u /dev/null packages/collectd/compile.patch:1.1
--- /dev/null	Thu Apr  8 16:04:37 2010
+++ packages/collectd/compile.patch	Thu Apr  8 16:04:32 2010
@@ -0,0 +1,12 @@
+compiling dbi.c with '-Werror' fails (dbi_initialize, dbi_driver_open, 
+dbi_driver_list are deprecated in recent libdbi)
+--- collectd-4.9.1/src/Makefile.am.orig	2010-04-08 15:49:05.024241083 +0200
++++ collectd-4.9.1/src/Makefile.am	2010-04-08 15:52:22.184768228 +0200
+@@ -265,6 +261,7 @@ if BUILD_PLUGIN_DBI
+ pkglib_LTLIBRARIES += dbi.la
+ dbi_la_SOURCES = dbi.c \
+ 		 utils_db_query.c utils_db_query.h
++dbi_la_CFLAGS = -Wall
+ dbi_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBDBI_CPPFLAGS)
+ dbi_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBDBI_LDFLAGS)
+ dbi_la_LIBADD = $(BUILD_WITH_LIBDBI_LIBS)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/collectd/collectd.spec?r1=1.87&r2=1.88&f=u