From 9acdf5f18f0e03e3501c0975a5c2f9099694d4cd Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 15 Feb 2016 19:09:11 +0100
Subject: [PATCH] cppunit-config no longer exists, use pkg-config

---
 ...nfig-no-longer-exists-use-pkg-config.patch | 62 +++++++++++++++++++
 zookeeper.spec                                | 12 +++-
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 0001-cppunit-config-no-longer-exists-use-pkg-config.patch

diff --git a/0001-cppunit-config-no-longer-exists-use-pkg-config.patch b/0001-cppunit-config-no-longer-exists-use-pkg-config.patch
new file mode 100644
index 0000000..506d4ad
--- /dev/null
+++ b/0001-cppunit-config-no-longer-exists-use-pkg-config.patch
@@ -0,0 +1,62 @@
+From f5fe371100b44d667065c8bba2c1522b26224c23 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Mon, 15 Feb 2016 19:08:14 +0100
+Subject: [PATCH] cppunit-config no longer exists, use pkg-config
+
+---
+ src/c/configure.ac                   | 4 +++-
+ src/recipes/lock/src/c/configure.ac  | 2 +-
+ src/recipes/queue/src/c/configure.ac | 2 +-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/c/configure.ac b/src/c/configure.ac
+index b4ed639..09860d9 100644
+--- a/src/c/configure.ac
++++ b/src/c/configure.ac
+@@ -25,6 +25,8 @@ DX_INIT_DOXYGEN([zookeeper],[c-doc.Doxyfile],[docs])
+ AM_INIT_AUTOMAKE([-Wall foreign])
+ AC_CONFIG_HEADER([config.h])
+ 
++PKG_PROG_PKG_CONFIG
++
+ # Checks for programs.
+ AC_ARG_WITH(cppunit,
+         [  --without-cppunit       do not use CPPUNIT])
+@@ -34,7 +36,7 @@ if test "$with_cppunit" = "no" ; then
+    CPPUNIT_INCLUDE=
+    CPPUNIT_LIBS=
+ else
+-   AM_PATH_CPPUNIT(1.10.2)
++   PKG_CHECK_MODULES([CPPUNIT], [cppunit])
+ fi
+ 
+ if test "$CALLER" = "ANT" ; then
+diff --git a/src/recipes/lock/src/c/configure.ac b/src/recipes/lock/src/c/configure.ac
+index 3954123..f494058 100644
+--- a/src/recipes/lock/src/c/configure.ac
++++ b/src/recipes/lock/src/c/configure.ac
+@@ -72,7 +72,7 @@ AC_C_VOLATILE
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ #check for cppunit 
+-AM_PATH_CPPUNIT(1.10.2)
++PKG_CHECK_MODULES([CPPUNIT], [cppunit])
+ # Checks for library functions.
+ AC_FUNC_UTIME_NULL
+ AC_CHECK_FUNCS([gettimeofday memset mkdir rmdir strdup strerror strstr strtol strtoul strtoull utime])
+diff --git a/src/recipes/queue/src/c/configure.ac b/src/recipes/queue/src/c/configure.ac
+index a9fb7b1..a2b840d 100644
+--- a/src/recipes/queue/src/c/configure.ac
++++ b/src/recipes/queue/src/c/configure.ac
+@@ -72,7 +72,7 @@ AC_C_VOLATILE
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ #check for cppunit 
+-AM_PATH_CPPUNIT(1.10.2)
++PKG_CHECK_MODULES([CPPUNIT], [cppunit])
+ # Checks for library functions.
+ AC_FUNC_UTIME_NULL
+ AC_CHECK_FUNCS([gettimeofday memset mkdir rmdir strdup strerror strstr strtol strtoul strtoull utime])
+-- 
+2.5.0
+
diff --git a/zookeeper.spec b/zookeeper.spec
index 5e899bd..061671e 100644
--- a/zookeeper.spec
+++ b/zookeeper.spec
@@ -19,12 +19,13 @@ Patch2:        %{name}-3.4.6-ivy-build.patch
 Patch3:        %{name}-3.4.6-server.patch
 # patch accepted in 3.5.0
 Patch4:        https://issues.apache.org/jira/secure/attachment/12570030/mt_adaptor.c.patch
+Patch5:        0001-cppunit-config-no-longer-exists-use-pkg-config.patch
 
 
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: boost-devel
-BuildRequires: cppunit-devel
+BuildRequires: pkgconfig(cppunit)
 BuildRequires: dos2unix
 BuildRequires: doxygen
 BuildRequires: graphviz
@@ -127,6 +128,7 @@ The python-%{name} package contains Python bindings for %{name}.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p0 -F2
+%patch5 -p1
 
 iconv -f iso8859-1 -t utf-8 src/c/ChangeLog > src/c/ChangeLog.conv && mv -f src/c/ChangeLog.conv src/c/ChangeLog
 sed -i 's/\r//' src/c/ChangeLog
@@ -145,6 +147,14 @@ sed -i 's@^dataDir=.*$@dataDir=%{_sharedstatedir}/zookeeper/data\ndataLogDir=%{_
 -Dant.build.javac.target=1.5 \
 package
 
+# cppunit-config patch touches configure.ac in these dirs
+pushd src/recipes/lock/src/c
+autoreconf -if
+popd
+pushd src/recipes/queue/src/c
+autoreconf -if
+popd
+
 pushd src/c
 autoreconf -if
 %configure --disable-static --disable-rpath