From 933b89504afab4f5af6f3cb910129efc33e05e8aa858b3165c848101d4e063ce Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Tue, 4 Oct 2022 11:23:20 +0000
Subject: [PATCH] Accepting request 1007550 from home:dirkmueller:Factory

- update to 0.13.0:
  * switch to cmake
  * Add macros to utilize libfmt formatting for messages
  * Allow distribution log4j to be used for socketservertest
  * Allow for hiding of location data
  * Add ability to get thread name not just ID
  * Doxygen documentation is not reproducible
  * Bugfixes see https://logging.apache.org/log4cxx/latest_stable/changelog.html#0.13.0

OBS-URL: https://build.opensuse.org/request/show/1007550
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/log4cxx?expand=0&rev=12
---
 apache-log4cxx-0.11.0.tar.gz |  3 ---
 apache-log4cxx-0.13.0.tar.gz |  3 +++
 log4cxx.changes              | 12 +++++++++++
 log4cxx.spec                 | 41 +++++++++++-------------------------
 4 files changed, 27 insertions(+), 32 deletions(-)
 delete mode 100644 apache-log4cxx-0.11.0.tar.gz
 create mode 100644 apache-log4cxx-0.13.0.tar.gz

diff --git a/apache-log4cxx-0.11.0.tar.gz b/apache-log4cxx-0.11.0.tar.gz
deleted file mode 100644
index 73ce26f..0000000
--- a/apache-log4cxx-0.11.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c316705ee3c4e5b919d3561d5f305162d21687aa6ae1f31f02f6cdadc958b393
-size 1145075
diff --git a/apache-log4cxx-0.13.0.tar.gz b/apache-log4cxx-0.13.0.tar.gz
new file mode 100644
index 0000000..6c5680d
--- /dev/null
+++ b/apache-log4cxx-0.13.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e5be64b6b1e6de8525f8b87635270b81f772a98902d20d7ac646fdf1ac08284
+size 551303
diff --git a/log4cxx.changes b/log4cxx.changes
index 50750f2..70f1157 100644
--- a/log4cxx.changes
+++ b/log4cxx.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Oct  2 13:13:38 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 0.13.0:
+  * switch to cmake
+  * Add macros to utilize libfmt formatting for messages
+  * Allow distribution log4j to be used for socketservertest
+  * Allow for hiding of location data
+  * Add ability to get thread name not just ID
+  * Doxygen documentation is not reproducible
+  * Bugfixes see https://logging.apache.org/log4cxx/latest_stable/changelog.html#0.13.0
+
 -------------------------------------------------------------------
 Sun Sep 27 20:11:25 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/log4cxx.spec b/log4cxx.spec
index 0431b4a..0fa06bb 100644
--- a/log4cxx.spec
+++ b/log4cxx.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package log4cxx
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,28 +17,25 @@
 
 
 Name:           log4cxx
-Version:        0.11.0
+Version:        0.13.0
 Release:        0
-%define soname 11
+%define soname 13
 Summary:        Log4j like C++ Logging Library
 License:        Apache-2.0
 Group:          Development/Libraries/C and C++
 URL:            https://logging.apache.org/log4cxx/latest_stable/
 Source:         https://downloads.apache.org/logging/log4cxx/%{version}/apache-log4cxx-%{version}.tar.gz
+BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  graphviz
 BuildRequires:  libapr-util1-devel
 BuildRequires:  libapr1-devel
 BuildRequires:  libtool
+BuildRequires:  openldap2-devel
 BuildRequires:  pkg-config
 BuildRequires:  unixODBC-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?sles_version} > 10
-BuildRequires:  libesmtp-devel
-%else
-BuildRequires:  openldap2-devel
-%endif
+BuildRequires:  zip
 
 %description
 Log4cxx is a port to C++ of the log4j logging library.
@@ -103,27 +100,12 @@ Log4cxx is a port to C++ of the log4j logging library.
 %setup -qn apache-log4cxx-%{version}
 
 %build
-./autogen.sh
-# --enable-latex-docs apparently doesn't do anything
-%configure --disable-static \
-	--with-ODBC=unixODBC \
-	--with-charset=utf-8 \
-	--with-logchar=utf-8 \
-	--enable-wchar_t \
-	--enable-html-docs \
-	--enable-dot \
-%if 0%{?sles_version} > 10
-	--with-SMTP=libesmtp \
-%endif
-	--enable-doxygen
-
-make %{?_smp_mflags}
+%cmake -DLOG4CXX_CHARSET=utf-8
+%cmake_build
 
 %install
-%makeinstall
-rm -f "%buildroot/%_libdir"/*.la
+%cmake_install
 mkdir -p %{buildroot}%{_docdir}/liblog4cxx
-mv %{buildroot}%{_datadir}/doc/log4cxx %{buildroot}%{_docdir}/liblog4cxx
 
 %post   -n liblog4cxx%{soname} -p /sbin/ldconfig
 %postun -n liblog4cxx%{soname} -p /sbin/ldconfig
@@ -132,9 +114,10 @@ mv %{buildroot}%{_datadir}/doc/log4cxx %{buildroot}%{_docdir}/liblog4cxx
 %{_libdir}/liblog4cxx.so.*
 
 %files -n liblog4cxx-devel
+%{_docdir}/liblog4cxx
+%{_includedir}/log4cxx
+%{_libdir}/cmake/log4cxx/
 %{_libdir}/liblog4cxx.so
 %{_libdir}/pkgconfig/liblog4cxx.pc
-%{_includedir}/log4cxx
-%{_docdir}/liblog4cxx
 
 %changelog