pool/log4cxx
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 76292 from home:ganglia:branches:devel:libraries:c_c++

Browse Source 
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
This commit is contained in:
Ismail Dönmez 2011-07-18 07:17:21 +00:00 committed by Git OBS Bridge
parent 56d2591c95
commit 6ae4bed114
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
log4cxx-fix_duplicate_entries.patch Normal file
View File

@ -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

2
log4cxx.spec
View File

@ -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