From 0b030d7e8d1b6cfa9b381a03196169865f41bdc0f87a2bf1e3e49260fedbd441 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 10 Oct 2016 20:42:26 +0000
Subject: [PATCH] Accepting request 434146 from
 home:adamm:branches:devel:libraries:c_c++

- update to version 1.1.2rc3
  + fix std::terminate() call on bad category name component count
    in PatternLayout
  + fix std::terminate() call on bad root category priority name
    in config file
  + remove RollingFileAppend prints log name to std::cout
- fix_sle11_build.patch: fix building on SLE11

OBS-URL: https://build.opensuse.org/request/show/434146
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/log4cpp?expand=0&rev=8
---
 fix_sle11_build.patch   | 20 ++++++++++++++++++++
 log4cpp-1.1.2rc2.tar.gz |  3 ---
 log4cpp-1.1.2rc3.tar.gz |  3 +++
 log4cpp.changes         | 11 +++++++++++
 log4cpp.spec            | 11 +++++++++--
 5 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 fix_sle11_build.patch
 delete mode 100644 log4cpp-1.1.2rc2.tar.gz
 create mode 100644 log4cpp-1.1.2rc3.tar.gz

diff --git a/fix_sle11_build.patch b/fix_sle11_build.patch
new file mode 100644
index 0000000..ad1d752
--- /dev/null
+++ b/fix_sle11_build.patch
@@ -0,0 +1,20 @@
+Summary: Remove extra ; that prevents building on SLE11
+
+Index: log4cpp/src/Appender.cpp
+===================================================================
+--- log4cpp.orig/src/Appender.cpp
++++ log4cpp/src/Appender.cpp
+@@ -18,11 +18,11 @@ namespace log4cpp {
+ 
+ 	Appender::AppenderMapStorage::AppenderMapStorage()  { 
+ 		_allAppenders = new AppenderMap(); 
+-	};
++	}
+ 	Appender::AppenderMapStorage::~AppenderMapStorage() { 
+ 		_deleteAllAppenders(); 
+ 		delete _allAppenders; 
+-	};
++	}
+ 	
+ 	Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer() {
+ 		 if (appenders_nifty_counter++ == 0) {
diff --git a/log4cpp-1.1.2rc2.tar.gz b/log4cpp-1.1.2rc2.tar.gz
deleted file mode 100644
index 82bc984..0000000
--- a/log4cpp-1.1.2rc2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa46bf54bac2bbbec772e0d057817d31dd57bcf01f00bb6d7e9970bd6fc05264
-size 593348
diff --git a/log4cpp-1.1.2rc3.tar.gz b/log4cpp-1.1.2rc3.tar.gz
new file mode 100644
index 0000000..dd4c325
--- /dev/null
+++ b/log4cpp-1.1.2rc3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d210517b7afe04a7238b0bd3a0bf504575ffa097a6c0eca02fc69a31b4763cd
+size 580644
diff --git a/log4cpp.changes b/log4cpp.changes
index c720f42..72e280c 100644
--- a/log4cpp.changes
+++ b/log4cpp.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Oct 10 15:33:28 UTC 2016 - adam.majer@suse.de
+
+- update to version 1.1.2rc3
+  + fix std::terminate() call on bad category name component count
+    in PatternLayout 
+  + fix std::terminate() call on bad root category priority name
+    in config file 
+  + remove RollingFileAppend prints log name to std::cout
+- fix_sle11_build.patch: fix building on SLE11
+
 -------------------------------------------------------------------
 Sat Jul  2 16:47:28 UTC 2016 - jengelh@inai.de
 
diff --git a/log4cpp.spec b/log4cpp.spec
index cbfb043..9e5a6f2 100644
--- a/log4cpp.spec
+++ b/log4cpp.spec
@@ -17,13 +17,19 @@
 
 
 Name:           log4cpp
-Version:        1.1.2~rc2
+%if 0%{suse_version} >= 1310
+Version:        1.1.2~rc3
 Release:        0
+%else
+Version:        1.1.2
+Release:        0
+%endif
 Summary:        C++ logging library
 License:        LGPL-2.1
 Group:          Development/Languages/C and C++
 Url:            http://log4cpp.sourceforge.net/
-Source:         %{name}-1.1.2rc2.tar.gz
+Source:         %{name}-1.1.2rc3.tar.gz
+Patch1:         fix_sle11_build.patch
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
@@ -63,6 +69,7 @@ the popular doxygen documentation generation tool.
 
 %prep
 %setup -q -n %{name}
+%patch1 -p1
 
 %build
 %configure --enable-doxygen --disable-static