commit cc1f762f53abeca7ac98eb0821907897bd7e6e79
Author: Jakub Bogusz <[email protected]>
Date: Fri Apr 11 15:38:41 2014 +0200
- handle idsa option
log4cpp-idsa.patch | 11 +++++++++++
log4cpp.spec | 10 +++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/log4cpp.spec b/log4cpp.spec
index 2f3c738..43765ab 100644
--- a/log4cpp.spec
+++ b/log4cpp.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_with idsa # IDS/A logging
+#
Summary: Library for flexible logging
Summary(pl.UTF-8): Biblioteka do elastycznego logowania
Name: log4cpp
@@ -9,10 +13,12 @@ Source0:
http://downloads.sourceforge.net/log4cpp/%{name}-%{version}.tar.gz
# Source0-md5: 1e173df8ee97205f412ff84aa93b8fbe
Patch0: %{name}-nolibs.patch
Patch1: %{name}-lt.patch
+Patch2: %{name}-idsa.patch
URL: http://log4cpp.sourceforge.net/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: doxygen
+%{?with_idsa:BuildRequires: idsa-devel}
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:1.4d
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -56,6 +62,7 @@ Ten pakiet zawiera statyczną bibliotekę log4cpp.
%setup -q -n %{name}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
@@ -64,7 +71,8 @@ Ten pakiet zawiera statyczną bibliotekę log4cpp.
%{__autoheader}
%{__automake}
%configure \
- --enable-doxygen
+ --enable-doxygen \
+ %{?with_idsa:--with-idsa}
%{__make}
%install
diff --git a/log4cpp-idsa.patch b/log4cpp-idsa.patch
new file mode 100644
index 0000000..46e79a5
--- /dev/null
+++ b/log4cpp-idsa.patch
@@ -0,0 +1,11 @@
+--- log4cpp/src/PropertyConfiguratorImpl.cpp.orig 2012-08-07
17:19:50.000000000 +0200
++++ log4cpp/src/PropertyConfiguratorImpl.cpp 2014-04-10 22:10:43.438164259
+0200
+@@ -237,7 +237,7 @@
+ // default idsa name ???
+ std::string idsaName = _properties.getString(appenderPrefix +
".idsaName", "foobar");
+
+- appender = new IdsaAppender(appenderName, idsaname);
++ appender = new IdsaAppender(appenderName, idsaName);
+ }
+ #endif // LOG4CPP_HAVE_LIBIDSA
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/log4cpp.git/commitdiff/cc1f762f53abeca7ac98eb0821907897bd7e6e79
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
