From 6ae4bed11433becb27116010b3b27ac211ecad310f4e9cbe6aa366d716132473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Mon, 18 Jul 2011 07:17:21 +0000
Subject: [PATCH] Accepting request 76292 from
 home:ganglia:branches:devel:libraries:c_c++

Fix for build problem, where older versions of automake don't like duplicate file entries.

OBS-URL: https://build.opensuse.org/request/show/76292
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/log4cxx?expand=0&rev=3
---
 log4cxx-fix_duplicate_entries.patch | 26 ++++++++++++++++++++++++++
 log4cxx.spec                        |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 log4cxx-fix_duplicate_entries.patch

diff --git a/log4cxx-fix_duplicate_entries.patch b/log4cxx-fix_duplicate_entries.patch
new file mode 100644
index 0000000..4471809
--- /dev/null
+++ b/log4cxx-fix_duplicate_entries.patch
@@ -0,0 +1,26 @@
+Index: apache-log4cxx-0.10.0.svn20080724/src/main/include/log4cxx/private/Makefile.am
+===================================================================
+--- apache-log4cxx-0.10.0.svn20080724.orig/src/main/include/log4cxx/private/Makefile.am
++++ apache-log4cxx-0.10.0.svn20080724/src/main/include/log4cxx/private/Makefile.am
+@@ -14,7 +14,7 @@
+ # limitations under the License.
+ #
+ privateincdir = $(includedir)/log4cxx/private
+-privateinc_HEADERS= $(top_builddir)/src/main/include/log4cxx/private/*.h log4cxx_private.h
++privateinc_HEADERS= log4cxx_private.h
+ DISTCLEANFILES = log4cxx_private.h
+ EXTRA_DIST = log4cxx_private.hw
+ 
+Index: apache-log4cxx-0.10.0.svn20080724/src/main/include/log4cxx/Makefile.am
+===================================================================
+--- apache-log4cxx-0.10.0.svn20080724.orig/src/main/include/log4cxx/Makefile.am
++++ apache-log4cxx-0.10.0.svn20080724/src/main/include/log4cxx/Makefile.am
+@@ -15,7 +15,7 @@
+ #
+ SUBDIRS = helpers net nt rolling spi varia xml config db private pattern filter
+ log4cxxincdir = $(includedir)/log4cxx
+-log4cxxinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/*.h log4cxx.h
++log4cxxinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/*.h
+ DISTCLEANFILES = log4cxx.h
+ EXTRA_DIST = log4cxx.hw
+ 
diff --git a/log4cxx.spec b/log4cxx.spec
index d8d1204..4050558 100644
--- a/log4cxx.spec
+++ b/log4cxx.spec
@@ -11,6 +11,7 @@ License:	Apache License v2.0
 Group:          Development/Libraries/C++
 Url:		http://logging.apache.org/log4cxx/index.html
 Source:		apache-log4cxx-%{version}.tar.bz2
+Patch0:         %{name}-fix_duplicate_entries.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 BuildRequires:	doxygen gcc-c++ graphviz libapr1-devel libapr-util1-devel unixODBC-devel
 
@@ -90,6 +91,7 @@ Log4cxx is a port to C++ of the log4j logging library.
 
 %prep
 %setup -qn apache-log4cxx-%{version}
+%patch0 -p1
 
 %build
 ./autogen.sh