diff --git a/log4cplus-2.0.7.tar.gz b/log4cplus-2.0.7.tar.gz deleted file mode 100644 index 4bb3eb666e028b8f0e5cc3e4aa43f58baedb0851..0000000000000000000000000000000000000000 Binary files a/log4cplus-2.0.7.tar.gz and /dev/null differ diff --git a/log4cplus-REL_2_1_0.tar.gz b/log4cplus-REL_2_1_0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..75da64359d94bdbda38e541e4a3506cd16b200dd Binary files /dev/null and b/log4cplus-REL_2_1_0.tar.gz differ diff --git a/log4cplus.spec b/log4cplus.spec index 6660abc9c42179ee92b3c749b2929fe082cf6ec4..49d6c21a73e97e36f37a5eb45684ece0e64db1e1 100644 --- a/log4cplus.spec +++ b/log4cplus.spec @@ -1,12 +1,17 @@ %define git_version %(echo %{version} | sed -e 's/\\./_/g') Name: log4cplus -Version: 2.0.7 -Release: 2 +Version: 2.1.0 +Release: 1 Summary: simple logging API by using C++ License: BSD-2-Clause and BSL-1.0 and Apache-2.0 URL: https://sourceforge.net/projects/log4cplus -Source0: https://github.com/log4cplus/log4cplus/releases/download/REL_%{git_version}/%{name}-%{version}.tar.gz +Source0: https://github.com/log4cplus/log4cplus/releases/download/REL_%{git_version}/%{name}-REL_2_1_0.tar.gz +# https://github.com/log4cplus/log4cplus/issues/169 +# git clone --recursive https://github.com/log4cplus/log4cplus.git +# cd log4cplus +# tar -cvf threadpool.tar.gz threadpool +Source1: threadpool.tar.gz BuildRequires: cmake g++ @@ -22,12 +27,16 @@ flexible, and arbitrarily granular control over log management and configuration. It is modeled after the Java log4j API. %prep -%setup -q -n %{name}-%{version}/ +%setup -q -n %{name}-REL_2_1_0/ +rm -rf threadpool +cp %{SOURCE1} . +tar -xvf threadpool.tar.gz +rm -rf threadpool.tar.gz %build export CFLAGS=$RPM_OPT_FLAGS export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11" -%configure +%configure make %{?_smp_mflags} %install @@ -48,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*.so %changelog +* Fri Nov 10 2023 Ge Wang - 2.1.0-1 +- Update to version 2.1.0 + * Tue Jun 7 2022 lijian - 2.0.7-2 - License compliance rectification diff --git a/threadpool.tar.gz b/threadpool.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f7ffaac2cdd1d8ffb1c871dab98562a20dd35abf Binary files /dev/null and b/threadpool.tar.gz differ