packages: collectd/collectd.spec, collectd/libiptc.patch, collectd/pld.patc...

Sat Oct 22 22:04:23 CEST 2011

Author: blues                        Date: Sat Oct 22 20:04:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 5.0.1 - removed outdated patches: libnotify, netfilter. pld patch added.

---- Files affected:
packages/collectd:
   collectd.spec (1.111 -> 1.112) , libiptc.patch (1.1 -> 1.2) , pld.patch (NONE -> 1.1)  (NEW), libnotify.patch (1.1 -> NONE)  (REMOVED), netfilter.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/collectd/collectd.spec
diff -u packages/collectd/collectd.spec:1.111 packages/collectd/collectd.spec:1.112

--- packages/collectd/collectd.spec:1.111	Sat Oct 22 19:02:15 2011
+++ packages/collectd/collectd.spec	Sat Oct 22 22:04:17 2011
@@ -68,12 +68,12 @@
 Summary:	Collects system information in RRD files
 Summary(pl.UTF-8):	Zbieranie informacji o systemie w plikach RRD
 Name:		collectd
-Version:	5.0.0
-Release:	5.1
+Version:	5.0.1
+Release:	1
 License:	GPL v2
 Group:		Daemons
 Source0:	http://collectd.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5:	7bfea6e82d35b36f16d1da2c71397213
+# Source0-md5:	9ad1e4334bd4a671284e8e92a3e3323e
 Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}-http.conf
@@ -82,10 +82,9 @@
 Source11:	%{name}-rrdtool.conf
 Patch0:		%{name}-collection.patch
 Patch1:		compile.patch
-Patch2:		netfilter.patch
-Patch3:		libnotify.patch
-Patch4:		noquote.patch
-Patch5:		libiptc.patch
+Patch2:		noquote.patch
+Patch3:		libiptc.patch
+Patch4:		pld.patch
 URL:		http://collectd.org/
 %{?with_ipmi:BuildRequires:	OpenIPMI-devel >= 2.0.14-3}
 BuildRequires:	autoconf
@@ -1203,8 +1202,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch4 -p0
 
 %build
 %{__libtoolize}
@@ -1216,6 +1214,7 @@
 %configure \
 	CPPFLAGS="-Wno-unused-but-set-variable" \
 	c_cv_have_libperl=yes \
+	--with-libiptc=/usr \
 	--with-libstatgrab=/usr \
 	--with-lm-sensors=/usr \
 	--with-libmysql=/usr \
@@ -1991,6 +1990,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.112  2011/10/22 20:04:17  blues
+- 5.0.1 - removed outdated patches: libnotify, netfilter. pld patch added.
+
 Revision 1.111  2011/10/22 17:02:15  blues
 - collection3 subpackage more fixes: missing files, requires, etc. NFY
 

================================================================
Index: packages/collectd/libiptc.patch
diff -u packages/collectd/libiptc.patch:1.1 packages/collectd/libiptc.patch:1.2
--- packages/collectd/libiptc.patch:1.1	Mon Aug 15 21:24:12 2011
+++ packages/collectd/libiptc.patch	Sat Oct 22 22:04:18 2011
@@ -1,22 +1,22 @@
---- collectd-5.0.0/src/Makefile.am.wiget	2011-08-15 21:03:20.991041776 +0200
-+++ collectd-5.0.0/src/Makefile.am	2011-08-15 21:03:47.589811740 +0200
-@@ -438,7 +438,7 @@ pkglib_LTLIBRARIES += iptables.la
- iptables_la_SOURCES = iptables.c
- iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS)
- iptables_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBIPTC_LDFLAGS)
--iptables_la_LIBADD = -liptc
-+iptables_la_LIBADD = -lip4tc -lip6tc
- collectd_LDADD += "-dlopen" iptables.la
- collectd_DEPENDENCIES += iptables.la
- endif
---- collectd-5.0.0/configure.in.wiget	2011-08-15 20:04:29.574726374 +0200
-+++ collectd-5.0.0/configure.in	2011-08-15 20:07:58.895465067 +0200
-@@ -1814,7 +1814,7 @@ fi
+--- ./configure.in.org	2011-10-22 21:33:31.473232680 +0200
++++ ./configure.in	2011-10-22 21:35:52.456386679 +0200
+@@ -1835,7 +1835,7 @@ fi
  # Check for the iptc_init symbol in the library.
- if test "x$with_libiptc" = "xyes"
+ if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
  then
 -	AC_CHECK_LIB(iptc, iptc_init,
 +	AC_CHECK_LIB(ip4tc, iptc_init,
- 		     [with_libiptc="yes"],
- 		     [with_libiptc="no (symbol 'iptc_init' not found)"])
- fi
+ 	[
+ 		AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).])
+ 	],
+--- ./src/Makefile.am.org	2011-10-22 21:38:17.816408886 +0200
++++ ./src/Makefile.am	2011-10-22 21:41:01.187261584 +0200
+@@ -445,7 +445,7 @@ if BUILD_WITH_OWN_LIBIPTC
+ iptables_la_LIBADD  = owniptc/libiptc.la
+ iptables_la_DEPENDENCIES = owniptc/libiptc.la
+ else
+-iptables_la_LIBADD = -liptc
++iptables_la_LIBADD = -lip4tc -lip6tc
+ endif
+ collectd_LDADD += "-dlopen" iptables.la
+ collectd_DEPENDENCIES += iptables.la

================================================================
Index: packages/collectd/pld.patch
diff -u /dev/null packages/collectd/pld.patch:1.1
--- /dev/null	Sat Oct 22 22:04:23 2011
+++ packages/collectd/pld.patch	Sat Oct 22 22:04:18 2011
@@ -0,0 +1,20 @@
+--- ./src/collectd.conf.in.org	2011-10-22 21:55:04.649429413 +0200
++++ ./src/collectd.conf.in	2011-10-22 21:55:40.707756274 +0200
+@@ -108,7 +108,7 @@
+ #@BUILD_PLUGIN_ONEWIRE_TRUE at LoadPlugin onewire
+ #@BUILD_PLUGIN_OPENVPN_TRUE at LoadPlugin openvpn
+ #@BUILD_PLUGIN_ORACLE_TRUE at LoadPlugin oracle
+-#@BUILD_PLUGIN_PERL_TRUE@<LoadPlugin perl>
++#@BUILD_PLUGIN_PERL_TRUE at LoadPlugin perl
+ #@BUILD_PLUGIN_PERL_TRUE@  Globals true
+ #@BUILD_PLUGIN_PERL_TRUE@</LoadPlugin>
+ #@BUILD_PLUGIN_PINBA_TRUE at LoadPlugin pinba
+@@ -117,7 +117,7 @@
+ #@BUILD_PLUGIN_POWERDNS_TRUE at LoadPlugin powerdns
+ #@BUILD_PLUGIN_PROCESSES_TRUE at LoadPlugin processes
+ #@BUILD_PLUGIN_PROTOCOLS_TRUE at LoadPlugin protocols
+-#@BUILD_PLUGIN_PYTHON_TRUE@<LoadPlugin python>
++#@BUILD_PLUGIN_PYTHON_TRUE at LoadPlugin python
+ #@BUILD_PLUGIN_PYTHON_TRUE@  Globals true
+ #@BUILD_PLUGIN_PYTHON_TRUE@</LoadPlugin>
+ #@BUILD_PLUGIN_REDIS_TRUE at LoadPlugin redis
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/collectd/collectd.spec?r1=1.111&r2=1.112&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/collectd/libiptc.patch?r1=1.1&r2=1.2&f=u

