package: unify version numbers

Author: sandro

CMakeLists.txt

@@ -1,6 +1,10 @@
 cmake_minimum_required(VERSION 3.10)
 
-project(log4cpp VERSION 4.0.5 LANGUAGES CXX)
+# Single source of truth for release version (also used by packaging scripts).
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" _log4cpp_version_raw)
+string(STRIP "${_log4cpp_version_raw}" _log4cpp_version)
+
+project(log4cpp VERSION ${_log4cpp_version} LANGUAGES CXX)
 
 include(GNUInstallDirs)
 

README.md

@@ -82,7 +82,7 @@ project(log4cpp-demo)
 add_executable(demo main.cpp)
 
 include(FetchContent)
-FetchContent_Declare(log4cpp GIT_REPOSITORY https://github.com/lwhttpdorg/log4cpp.git GIT_TAG v4.0.5)
+FetchContent_Declare(log4cpp GIT_REPOSITORY https://github.com/lwhttpdorg/log4cpp.git GIT_TAG v4.0.6)
 FetchContent_MakeAvailable(log4cpp)
 target_link_libraries(demo log4cpp)
 ```
@@ -561,11 +561,14 @@ Build RPM:
 
 ```shell
 rpmdev-setuptree
-tar -czf ~/rpmbuild/SOURCES/liblog4cpp-4.0.5.tar.gz log4cpp/
-cp log4cpp/liblog4cpp.spec rpmbuild/SPECS/
+VERSION=$(sed -n 's/^project(log4cpp VERSION \([0-9.]*\).*/\1/p' log4cpp/CMakeLists.txt)
+tar -czf ~/rpmbuild/SOURCES/liblog4cpp-${VERSION}.tar.gz log4cpp/
+sed "s/@VERSION@/${VERSION}/g" log4cpp/liblog4cpp.spec.in > ~/rpmbuild/SPECS/liblog4cpp.spec
 rpmbuild -ba ~/rpmbuild/SPECS/liblog4cpp.spec
 ```
 
+The tarball name and spec `Version` come from `liblog4cpp.spec.in` after substituting `@VERSION@`; that value should match `project(log4cpp VERSION …)` in `CMakeLists.txt` (see `build-rpm.sh`).
+
 #### 4.4.2. Using build script
 
 This project provides a build script `build-rpm.sh` and `build-deb.sh` to build RPM and DEB packages

README_ZH.md

@@ -77,7 +77,7 @@ project(log4cpp-demo)
 add_executable(demo main.cpp)
 
 include(FetchContent)
-FetchContent_Declare(log4cpp GIT_REPOSITORY https://github.com/lwhttpdorg/log4cpp.git GIT_TAG v4.0.5)
+FetchContent_Declare(log4cpp GIT_REPOSITORY https://github.com/lwhttpdorg/log4cpp.git GIT_TAG v4.0.6)
 FetchContent_MakeAvailable(log4cpp)
 target_link_libraries(demo log4cpp)
 ```
@@ -550,11 +550,14 @@ DEB_BUILD_OPTIONS="noddebs" dpkg-buildpackage -us -uc -b -j$(nproc)
 
 ```shell
 rpmdev-setuptree
-tar -czf ~/rpmbuild/SOURCES/liblog4cpp-4.0.5.tar.gz log4cpp/
-cp log4cpp/liblog4cpp.spec rpmbuild/SPECS/
+VERSION=$(sed -n 's/^project(log4cpp VERSION \([0-9.]*\).*/\1/p' log4cpp/CMakeLists.txt)
+tar -czf ~/rpmbuild/SOURCES/liblog4cpp-${VERSION}.tar.gz log4cpp/
+sed "s/@VERSION@/${VERSION}/g" log4cpp/liblog4cpp.spec.in > ~/rpmbuild/SPECS/liblog4cpp.spec
 rpmbuild -ba ~/rpmbuild/SPECS/liblog4cpp.spec
 ```
 
+源码包与 spec 中的版本由 `liblog4cpp.spec.in` 经 `@VERSION@` 替换得到，应与 `CMakeLists.txt` 中 `project(log4cpp VERSION …)` 一致（亦可直接用 `build-rpm.sh`）。
+
 #### 4.4.2. 使用构建脚本
 
 本项目提供了构建脚本`build-rpm.sh`和`build-deb.sh`, 用于构建 RPM 和 DEB 软件包

VERSION

@@ -0,0 +1 @@
+4.0.6

build-rpm.sh

@@ -44,12 +44,15 @@ fi
 echo "==> Setting up rpmbuild tree..."
 rpmdev-setuptree
 
-echo "==> Creating source tarball..."
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+VERSION="$(tr -d '\r\n' < "${SCRIPT_DIR}/VERSION")"
+
+echo "==> Creating source tarball (version ${VERSION})..."
 cd ..
-tar -czf ~/rpmbuild/SOURCES/liblog4cpp-4.0.5.tar.gz log4cpp/
+tar -czf "${HOME}/rpmbuild/SOURCES/liblog4cpp-${VERSION}.tar.gz" log4cpp/
 
-echo "==> Copying spec file..."
-cp log4cpp/liblog4cpp.spec ~/rpmbuild/SPECS/
+echo "==> Writing spec with VERSION from ${SCRIPT_DIR}/VERSION..."
+sed "s/^%define _version .*/%define _version ${VERSION}/" log4cpp/liblog4cpp.spec > "${HOME}/rpmbuild/SPECS/liblog4cpp.spec"
 
 echo "==> Building RPM package..."
 rpmbuild -ba ~/rpmbuild/SPECS/liblog4cpp.spec

debian/changelog

@@ -1,4 +1,4 @@
-liblog4cpp (4.0.5) stable; urgency=low
+liblog4cpp (4.0.6) stable; urgency=low
 
   * Fix: Avoid exceptions from std::filesystem::exists when checking config file access
 

liblog4cpp.spec

@@ -1,5 +1,5 @@
-# Define the version once to ensure consistency
-%define _version 4.0.5
+# Must match the first line of ../VERSION (build-rpm.sh overwrites this when building).
+%define _version 4.0.6
 
 Name:           liblog4cpp
 Version:        %{_version}
@@ -61,7 +61,7 @@ developing applications that use %{name}.
 %{_libdir}/pkgconfig/log4cpp.pc
 
 %changelog
-* Mon Jan 19 2026 Developer <developer@log4cpp.org> - 4.0.5-1
+* Mon Jan 19 2026 Developer <developer@log4cpp.org> - 4.0.6-1
 - Initial native RPM release
 - Internalized nlohmann-json dependency to hide implementation details
 - Unified include path to /usr/include/log4cpp for standard API usage