diff --git a/log4cplus-2.1.1.tar.xz b/log4cplus-2.1.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..de155ad8acf4f28d6e21a8060bc95e2e622f3316 Binary files /dev/null and b/log4cplus-2.1.1.tar.xz differ diff --git a/log4cplus-REL_2_1_0.tar.gz b/log4cplus-REL_2_1_0.tar.gz deleted file mode 100644 index 75da64359d94bdbda38e541e4a3506cd16b200dd..0000000000000000000000000000000000000000 Binary files a/log4cplus-REL_2_1_0.tar.gz and /dev/null differ diff --git a/log4cplus.spec b/log4cplus.spec index 49d6c21a73e97e36f37a5eb45684ece0e64db1e1..418c6b4ce4f615081c98045efd20f89d6f6bd914 100644 --- a/log4cplus.spec +++ b/log4cplus.spec @@ -1,19 +1,14 @@ -%define git_version %(echo %{version} | sed -e 's/\\./_/g') +%define VER %(echo %{version} | tr . _) Name: log4cplus -Version: 2.1.0 +Version: 2.1.1 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}-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 +URL: https://github.com/log4cplus/log4cplus +Source0: https://github.com/log4cplus/log4cplus/releases/download/REL_%{VER}/%{name}-%{version}.tar.xz -BuildRequires: cmake g++ +BuildRequires: gcc-c++ make %description log4cplus is a simple to use C++ logging API providing thread-safe, flexible, and arbitrarily granular control over log management and configuration. It is modelled after the Java log4j API. @@ -27,29 +22,21 @@ flexible, and arbitrarily granular control over log management and configuration. It is modeled after the Java log4j API. %prep -%setup -q -n %{name}-REL_2_1_0/ -rm -rf threadpool -cp %{SOURCE1} . -tar -xvf threadpool.tar.gz -rm -rf threadpool.tar.gz +%autosetup -n %{name}-%{version} %build export CFLAGS=$RPM_OPT_FLAGS export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11" %configure -make %{?_smp_mflags} +%make_build %install -rm -rf $RPM_BUILD_ROOT %make_install - -%clean -rm -rf $RPM_BUILD_ROOT +%delete_la %files %license LICENSE %_libdir/lib*.so* -%_libdir/*.la %files devel %{_includedir}/* @@ -57,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*.so %changelog +* Tue Sep 03 2024 Funda Wang - 2.1.1-1 +- update to 2.1.1 + * Fri Nov 10 2023 Ge Wang - 2.1.0-1 - Update to version 2.1.0 diff --git a/log4cplus.yaml b/log4cplus.yaml new file mode 100644 index 0000000000000000000000000000000000000000..aff3f4e090484e211f741c1e2996e9ab58f8d2ef --- /dev/null +++ b/log4cplus.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: log4cplus/log4cplus +tag_prefix: REL_ +seperator: _ diff --git a/threadpool.tar.gz b/threadpool.tar.gz deleted file mode 100644 index f7ffaac2cdd1d8ffb1c871dab98562a20dd35abf..0000000000000000000000000000000000000000 Binary files a/threadpool.tar.gz and /dev/null differ