From a7df4f3e01ec675c44f682298c3745e4578a51e99ec6271b41fbcea063fd7543 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Sat, 17 Sep 2011 14:51:55 +0000
Subject: [PATCH] Accepting request 82484 from home:jengelh:nl

iptc fixage, tested

OBS-URL: https://build.opensuse.org/request/show/82484
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=92
---
 collectd-iptc.diff      | 56 +++++++++++++++++++++++++++++++----------
 collectd-libip4tc.patch | 16 ------------
 collectd.spec           |  6 ++---
 3 files changed, 45 insertions(+), 33 deletions(-)
 delete mode 100644 collectd-libip4tc.patch

diff --git a/collectd-iptc.diff b/collectd-iptc.diff
index aa2b401..2415d5f 100644
--- a/collectd-iptc.diff
+++ b/collectd-iptc.diff
@@ -1,12 +1,13 @@
 ---
- configure.in |  102 +----------------------------------------------------------
- 1 file changed, 3 insertions(+), 99 deletions(-)
+ configure.in    |  107 --------------------------------------------------------
+ src/Makefile.am |   15 ++-----
+ 2 files changed, 5 insertions(+), 117 deletions(-)
 
 Index: collectd-4.10.3/configure.in
 ===================================================================
 --- collectd-4.10.3.orig/configure.in
 +++ collectd-4.10.3/configure.in
-@@ -1560,100 +1560,10 @@ AM_CONDITIONAL(BUILD_WITH_LIBGCRYPT, tes
+@@ -1560,113 +1560,8 @@ AM_CONDITIONAL(BUILD_WITH_LIBGCRYPT, tes
  # }}}
  
  # --with-libiptc {{{
@@ -102,18 +103,16 @@ Index: collectd-4.10.3/configure.in
 -#include "$srcdir/src/owniptc/ipt_kernel_headers.h"
 -	])
 -fi
-+PKG_CHECK_MODULES([LIBIPTC], [libiptc], [with_libiptc=yes], [with_libiptc=no])
-+LIBIPTC_CPPFLAGS="$LIBIPTC_CFLAGS";
-+AC_SUBST([LIBIPTC_CPPFLAGS])
++PKG_CHECK_MODULES([libiptc], [libiptc], [with_libiptc=yes], [with_libiptc=no])
  AM_CONDITIONAL(BUILD_WITH_LIBIPTC, test "x$with_libiptc" = "xyes")
 -AM_CONDITIONAL(BUILD_WITH_OWN_LIBIPTC, test "x$with_own_libiptc" = "xyes")
- if test "x$with_libiptc" = "xyes"
- then
- 	BUILD_WITH_LIBIPTC_CPPFLAGS="$LIBIPTC_CPPFLAGS"
-@@ -1661,12 +1571,6 @@ then
- 	AC_SUBST(BUILD_WITH_LIBIPTC_CPPFLAGS)
- 	AC_SUBST(BUILD_WITH_LIBIPTC_LDFLAGS)
- fi
+-if test "x$with_libiptc" = "xyes"
+-then
+-	BUILD_WITH_LIBIPTC_CPPFLAGS="$LIBIPTC_CPPFLAGS"
+-	BUILD_WITH_LIBIPTC_LDFLAGS="$LIBIPTC_LDFLAGS"
+-	AC_SUBST(BUILD_WITH_LIBIPTC_CPPFLAGS)
+-	AC_SUBST(BUILD_WITH_LIBIPTC_LDFLAGS)
+-fi
 -if test "x$with_own_libiptc" = "xyes"
 -then
 -	AC_DEFINE(OWN_LIBIPTC, 1, [Define to 1 if we use the shipped iptc library.])
@@ -123,3 +122,34 @@ Index: collectd-4.10.3/configure.in
  # }}}
  
  # --with-java {{{
+Index: collectd-4.10.3/src/Makefile.am
+===================================================================
+--- collectd-4.10.3.orig/src/Makefile.am
++++ collectd-4.10.3/src/Makefile.am
+@@ -1,7 +1,4 @@
+ SUBDIRS = libcollectdclient
+-if BUILD_WITH_OWN_LIBIPTC
+-SUBDIRS += owniptc
+-endif
+ if BUILD_WITH_OWN_LIBOCONFIG
+ SUBDIRS += liboconfig
+ endif
+@@ -413,14 +410,10 @@ endif # BUILD_PLUGIN_INTERFACE
+ if BUILD_PLUGIN_IPTABLES
+ 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)
+-if BUILD_WITH_OWN_LIBIPTC
+-iptables_la_LIBADD  = owniptc/libiptc.la
+-iptables_la_DEPENDENCIES = owniptc/libiptc.la
+-else
+-iptables_la_LIBADD = -liptc
+-endif
++iptables_la_CPPFLAGS = $(AM_CPPFLAGS)
++iptables_la_CFLAGS = ${AM_CFLAGS} ${libiptc_CFLAGS}
++iptables_la_LDFLAGS = -module -avoid-version
++iptables_la_LIBADD = ${libiptc_LIBS}
+ collectd_LDADD += "-dlopen" iptables.la
+ collectd_DEPENDENCIES += iptables.la
+ endif
diff --git a/collectd-libip4tc.patch b/collectd-libip4tc.patch
deleted file mode 100644
index c40de02..0000000
--- a/collectd-libip4tc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 5c3564c..d1c293c 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1630,9 +1630,9 @@ fi
- # Check for the iptc_init symbol in the library.
- 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,
- 	[
--		AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).])
-+		AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-lip4tc).])
- 	],
- 	[
- 		with_libiptc="yes"
diff --git a/collectd.spec b/collectd.spec
index a58f7b3..296cf71 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -145,9 +145,8 @@ Patch22:        collectd-collection3.patch
 Patch23:        collectd-javac_target.patch
 Patch24:        collectd-pkgconfig_libnotify_add_gtk.patch
 Patch25:        collectd-df-remove-duplicates.patch
-Patch26:        collectd-libip4tc.patch
+Patch26:        collectd-iptc.diff
 Patch27:        collectd-libnotify_070.patch
-Patch28:        collectd-iptc.diff
 Url:            http://collectd.org/
 Group:          System/Monitoring
 License:        GNU General Public License (GPL)
@@ -515,9 +514,8 @@ popd #iproute2
 %patch23
 %patch24
 %patch25 -p1
-%patch26 -p1
+%patch -P 26 -p1
 %patch27 -p1
-%patch28 -p1
 
 %__sed -i 's|@@VERSION@@|%{version}|g' configure.in