public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/log4cpp] f44: Release 1.1.6
@ 2026-06-01 7:14 Antonio Trande
0 siblings, 0 replies; only message in thread
From: Antonio Trande @ 2026-06-01 7:14 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/log4cpp
Branch : f44
Commit : b2ed3a7be7cd1f2ab79a9ce2c5c5af9a60ca40ab
Author : Antonio Trande <sagitter@fedoraproject.org>
Date : 2026-06-01T09:12:31+02:00
Stats : +50/-225 in 11 file(s)
URL : https://src.fedoraproject.org/rpms/log4cpp/c/b2ed3a7be7cd1f2ab79a9ce2c5c5af9a60ca40ab?branch=f44
Log:
Release 1.1.6
---
diff --git a/.gitignore b/.gitignore
index 2620db9..1bd6964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ log4cpp-1.0.tar.gz
/log4cpp-1.1.tar.gz
/log4cpp-1.1.1.tar.gz
/log4cpp-1.1.3.tar.gz
+/log4cpp-1.1.6.tar.gz
diff --git a/03_aclocal_automake.diff b/03_aclocal_automake.diff
deleted file mode 100644
index 503c197..0000000
--- a/03_aclocal_automake.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,3 +1,5 @@
-+ACLOCAL_AMFLAGS = -I m4
-+
- if DOC
- SUBDIRS = msvc6 bcb5 config src include tests doc
- else
diff --git a/log4cpp-1.0-fix-doc-dest.patch b/log4cpp-1.0-fix-doc-dest.patch
deleted file mode 100644
index aa7f60c..0000000
--- a/log4cpp-1.0-fix-doc-dest.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- log4cpp-1.0.orig/doc/Makefile.am 2007-09-03 05:50:42.000000000 -0400
-+++ log4cpp-1.0/doc/Makefile.am 2008-12-12 12:14:24.000000000 -0500
-@@ -1,7 +1,7 @@
- SUBDIRS = html
-
- man3dir = $(mandir)/man3
--docdir = $(prefix)/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
-+docdir = $(prefix)/share/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
-
- EXTRA_DIST = \
- mainPage.txt
-@@ -22,23 +22,23 @@
-
-
- install-data-local:
-- $(mkinstalldirs) $(man3dir)
-+ $(mkinstalldirs) $(DESTDIR)/$(man3dir)
- @for i in ./man/man3/log4cpp.3 ./man/man3/log4cpp_*.3; do \
- inst=`basename $$i | sed 's/_/::/g'`; \
- echo "$(INSTALL_DATA) $$i$(man3dir)/$$inst"; \
-- $(INSTALL_DATA) $$i $(man3dir)/$$inst; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)/$(man3dir)/$$inst; \
- done
-- $(mkinstalldirs) $(docdir)
-- cp -r html/. $(docdir)
-- $(RM) -r -f $(docdir)/CVS \
-- $(docdir)/Makefile.am \
-- $(docdir)/Makefile.in \
-- $(docdir)/Makefile
-+ $(mkinstalldirs) $(DESTDIR)/$(docdir)
-+ cp -r html/. $(DESTDIR)/$(docdir)
-+ $(RM) -r -f $(DESTDIR)/$(docdir)/CVS \
-+ $(DESTDIR)/$(docdir)/Makefile.am \
-+ $(DESTDIR)/$(docdir)/Makefile.in \
-+ $(DESTDIR)/$(docdir)/Makefile
-
- uninstall-local:
-- $(RM) $(man3dir)/log4cpp.3
-- $(RM) $(man3dir)/log4cpp::*.3
-- $(RM) -r -f $(docdir)
-+ $(RM) $(DESTDIR)/$(man3dir)/log4cpp.3
-+ $(RM) $(DESTDIR)/$(man3dir)/log4cpp::*.3
-+ $(RM) -r -f $(DESTDIR)/$(docdir)
-
- clean-local:
- $(RM) -r latex
diff --git a/log4cpp-1.0-gcc43.patch b/log4cpp-1.0-gcc43.patch
deleted file mode 100644
index 9979426..0000000
--- a/log4cpp-1.0-gcc43.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Only in log4cpp-1.0: config.log
-diff -ru log4cpp-1.0.orig/src/BasicLayout.cpp log4cpp-1.0/src/BasicLayout.cpp
---- log4cpp-1.0.orig/src/BasicLayout.cpp 2006-09-30 02:03:20.000000000 -0400
-+++ log4cpp-1.0/src/BasicLayout.cpp 2008-12-12 12:01:16.000000000 -0500
-@@ -8,6 +8,8 @@
- */
-
- #include "PortabilityImpl.hh"
-+#include <cstdlib>
-+#include <memory>
- #include <log4cpp/BasicLayout.hh>
- #include <log4cpp/Priority.hh>
- #include <log4cpp/FactoryParams.hh>
-Only in log4cpp-1.0/src: BasicLayout.cpp~
-Only in log4cpp-1.0/src: BasicLayout.cpp.gcc43
-Only in log4cpp-1.0/src/.deps: BasicLayout.Tpo
-Only in log4cpp-1.0/src/.deps: PatternLayout.Plo
-Only in log4cpp-1.0.orig/src/.deps: PatternLayout.Tpo
-Only in log4cpp-1.0/src/.libs: PatternLayout.o
-diff -ru log4cpp-1.0.orig/src/PatternLayout.cpp log4cpp-1.0/src/PatternLayout.cpp
---- log4cpp-1.0.orig/src/PatternLayout.cpp 2007-08-28 03:54:12.000000000 -0400
-+++ log4cpp-1.0/src/PatternLayout.cpp 2008-12-12 11:57:59.000000000 -0500
-@@ -8,6 +8,7 @@
-
- #include "PortabilityImpl.hh"
-
-+#include <cstdlib>
- #include <log4cpp/PatternLayout.hh>
- #include <log4cpp/Priority.hh>
- #include <log4cpp/NDC.hh>
-Only in log4cpp-1.0/src: PatternLayout.cpp.gcc43
-Only in log4cpp-1.0/src: PatternLayout.lo
-Only in log4cpp-1.0.orig/src: PatternLayout.loT
-Only in log4cpp-1.0/src: PatternLayout.o
diff --git a/log4cpp-1.0-no-snprintf.patch b/log4cpp-1.0-no-snprintf.patch
deleted file mode 100644
index bd367df..0000000
--- a/log4cpp-1.0-no-snprintf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up log4cpp/src/Makefile.am.no-snprintf log4cpp/src/Makefile.am
---- log4cpp/src/Makefile.am.no-snprintf 2017-07-12 23:39:11.000000000 -0600
-+++ log4cpp/src/Makefile.am 2019-11-20 09:24:22.934246996 -0700
-@@ -2,7 +2,7 @@ lib_LTLIBRARIES = liblog4cpp.la
-
- INCLUDES = -I$(top_srcdir)/include
-
--noinst_HEADERS = snprintf.c Localtime.hh
-+noinst_HEADERS = Localtime.hh
-
- liblog4cpp_la_SOURCES = \
- Appender.cpp \
-diff -up log4cpp/src/Makefile.in.no-snprintf log4cpp/src/Makefile.in
---- log4cpp/src/Makefile.in.no-snprintf 2019-11-20 09:24:22.936246987 -0700
-+++ log4cpp/src/Makefile.in 2019-11-20 09:25:05.758058149 -0700
-@@ -297,7 +297,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- lib_LTLIBRARIES = liblog4cpp.la
- INCLUDES = -I$(top_srcdir)/include
--noinst_HEADERS = snprintf.c Localtime.hh
-+noinst_HEADERS = Localtime.hh
- liblog4cpp_la_SOURCES = Appender.cpp AppenderSkeleton.cpp \
- AppendersFactory.cpp BufferingAppender.cpp FactoryParams.cpp \
- LayoutsFactory.cpp LevelEvaluator.cpp Localtime.cpp \
diff --git a/log4cpp-1.0-remove-pc-cflags.patch b/log4cpp-1.0-remove-pc-cflags.patch
deleted file mode 100644
index 00d4d3e..0000000
--- a/log4cpp-1.0-remove-pc-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- log4cpp-1.0.orig/log4cpp.pc.in 2008-12-12 11:37:04.000000000 -0500
-+++ log4cpp-1.0/log4cpp.pc.in 2008-12-12 12:07:24.000000000 -0500
-@@ -6,5 +6,5 @@
- Name: @PACKAGE@
- Description: C++ library for flexible logging, modeled after Log4j
- Version: @VERSION@
--Libs: -L${libdir} @log4cpp_libs@
-+Libs: -L${libdir}
- Cflags: -I${includedir} @log4cpp_cflags@
---- log4cpp-1.0.orig/m4/ac_config_pkgconfig_in.m4 2004-01-27 05:27:38.000000000 -0500
-+++ log4cpp-1.0/m4/ac_config_pkgconfig_in.m4 2008-12-12 12:10:47.000000000 -0500
-@@ -121,7 +121,7 @@
- fi
- echo 'Version: @VERSION@' >>$PKGCONFIG_FILE
- echo 'Libs: -L${libdir} @MODULE_DOWN[]_libs@' >>$PKGCONFIG_FILE
--echo 'Cflags: -I${includedir} @MODULE_DOWN[]_cflags@' >>$PKGCONFIG_FILE
-+echo 'Cflags: -I${includedir}' >>$PKGCONFIG_FILE
- m4_pushdef([PKGCONFIG_UP], [m4_translit([$1], [a-z], [A-Z])])dnl
- PKGCONFIG_UP[]_PKGCONFIG="PKGCONFIG_DIR[]$1-config"
- AC_SUBST(PKGCONFIG_UP[]_PKGCONFIG)
diff --git a/log4cpp-1.1.6-fix_soname.patch b/log4cpp-1.1.6-fix_soname.patch
new file mode 100644
index 0000000..bb1d832
--- /dev/null
+++ b/log4cpp-1.1.6-fix_soname.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt 2026-02-27 20:19:00.000000000 +0100
++++ b/CMakeLists.txt 2026-05-21 14:14:58.148045428 +0200
+@@ -20,7 +20,7 @@
+ INCLUDE ( CMakePackageConfigHelpers )
+
+ SET ( LOG4CPP_LIBRARY_NAME "log4cpp" )
+-#SET ( CMAKE_VERBOSE_MAKEFILE ON )
++SET ( CMAKE_VERBOSE_MAKEFILE ON )
+
+ IF ( CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR )
+ SET ( LOG4CPP_IS_TOP_LEVEL ON )
+@@ -119,7 +119,7 @@
+ ADD_LIBRARY ( ${TARGET_NAME} ${LIB_TYPE} ${LOG4CPP_LIBRARY_SOURCES} )
+ TARGET_LINK_LIBRARIES ( ${TARGET_NAME} PRIVATE Threads::Threads )
+ LIST ( APPEND LOG4CPP_INSTALL_TARGETS ${TARGET_NAME} )
+- SET_TARGET_PROPERTIES ( ${TARGET_NAME} PROPERTIES OUTPUT_NAME ${OUTPUT_NAME} )
++ SET_TARGET_PROPERTIES ( ${TARGET_NAME} PROPERTIES VERSION 5.0.6 SOVERSION 5 OUTPUT_NAME ${OUTPUT_NAME} )
+ TARGET_INCLUDE_DIRECTORIES ( ${TARGET_NAME}
+ PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
diff --git a/log4cpp-configure-c99.patch b/log4cpp-configure-c99.patch
deleted file mode 100644
index a2c18fd..0000000
--- a/log4cpp-configure-c99.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Do not call the undeclared exit function. This avoids an implicit
-function declaration, which future compilers may reject by default.
-
-Submitted upstream: <https://sourceforge.net/p/log4cpp/patches/49/>
-
-diff --git a/m4/AC_FUNC_SNPRINTF.m4 b/m4/AC_FUNC_SNPRINTF.m4
-index 08af5218eaf90e56..3d77d0f874f39ba0 100644
---- a/m4/AC_FUNC_SNPRINTF.m4
-+++ b/m4/AC_FUNC_SNPRINTF.m4
-@@ -13,7 +13,7 @@ dnl
- AC_DEFUN([AC_FUNC_SNPRINTF],
- [AC_CACHE_CHECK(for working snprintf, ac_cv_func_snprintf,
- [AC_TRY_RUN([#include <stdio.h>
--int main () { int l = snprintf(NULL,0,"%d",100); exit (!((3 <= l) || (-1 == l))); }
-+int main () { int l = snprintf(NULL,0,"%d",100); return !((3 <= l) || (-1 == l)); }
- ], ac_cv_func_snprintf=yes, ac_cv_func_snprintf=no,
- ac_cv_func_snprintf=no)])
- if test $ac_cv_func_snprintf = yes; then
diff --git a/log4cpp-version-1.1.3.patch b/log4cpp-version-1.1.3.patch
deleted file mode 100644
index 79e2999..0000000
--- a/log4cpp-version-1.1.3.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -uNr log4cpp.ORIG/configure.in log4cpp/configure.in
---- log4cpp.ORIG/configure.in 2015-03-23 14:35:01.946455951 +0100
-+++ log4cpp/configure.in 2015-03-23 14:35:25.304824413 +0100
-@@ -1,4 +1,4 @@
--AC_INIT(log4cpp, 1.1)
-+AC_INIT(log4cpp, 1.1.3)
-
- # autoconf 2.50 or higher to rebuild aclocal.m4, because the
- # AC_CREATE_PREFIX_CONFIG_H macro needs the AS_DIRNAME macro.
diff --git a/log4cpp.spec b/log4cpp.spec
index 01b0e07..df4806d 100644
--- a/log4cpp.spec
+++ b/log4cpp.spec
@@ -1,29 +1,18 @@
Name: log4cpp
-Version: 1.1.3
+Version: 1.1.6
Release: %autorelease
Summary: C++ logging library
-
-# Automatically converted from old format: LGPLv2+ - review is highly recommended.
-License: LicenseRef-Callaway-LGPLv2+
-URL: http://sourceforge.net/projects/log4cpp/
-Source0: http://downloads.sourceforge.net/log4cpp/%{name}-%{version}.tar.gz
-# Fix errors when compiling with gcc >= 4.3
-Patch0: log4cpp-1.0-gcc43.patch
-# Don't put build cflags in .pc
-Patch1: log4cpp-1.0-remove-pc-cflags.patch
-# Install docs into DESTDIR
-Patch2: log4cpp-1.0-fix-doc-dest.patch
-# Don't try to build snprintf.c
-Patch3: log4cpp-1.0-no-snprintf.patch
-# Version is actually 1.1.3
-Patch4: log4cpp-version-1.1.3.patch
-Patch5: 03_aclocal_automake.diff
-Patch6: log4cpp-configure-c99.patch
+License: LGPL-2.1-only
+URL: https://log4cpp.sourceforge.net/
+Source0: https://sourceforge.net/projects/log4cpp/files/REL_%{version}_Mar_12_2026/%{name}-%{version}.tar.gz
BuildRequires: gcc-c++
-BuildRequires: doxygen
-BuildRequires: automake, autoconf, libtool
-BuildRequires: make
+BuildRequires: cmake
+BuildRequires: dos2unix
+Obsoletes: log4cpp-doc < 0:1.1.6
+
+# This patch modifies CMake file to create a versioned soname library
+Patch0: log4cpp-1.1.6-fix_soname.patch
%description
A library of C++ classes for flexible logging to files, syslog, IDSA and
@@ -31,68 +20,42 @@ other destinations. It is modeled after the Log for Java library
(http://www.log4j.org), staying as close to their API as is reasonable.
%package devel
-Summary: Header files, libraries and development man pages %{name}
+Summary: Header files, libraries and development files
Requires: %{name}%{?_isa} = %{version}-%{release}
-%if 0%{?el4}%{?el5}
-Requires: pkgconfig
-%endif
-
%description devel
-This package contains the header files, static libraries and development
-man pages for %{name}. If you like to develop programs using %{name},
-you will need to install %{name}-devel.
-
-%package doc
-Summary: Development documentation for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description doc
-This package contains the development documentation for %{name}.
-If you like to documentation to develop programs using %{name},
-you will need to install %{name}-devel.
+This package contains the header files and development
+man pages for %{name}.
%prep
-%setup -q -n log4cpp
-%patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1
-%patch -P3 -p1 -b .no-snprintf
-%patch -P4 -p1
-%patch -P5 -p1
-%patch -P6 -p1
+%autosetup -n log4cpp -p 1
+
# Delete non-free (but freely distributable) file under Artistic 1.0
# just to be sure we're not using it.
rm -rf src/snprintf.c
-#Convert line endings.
-iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
+
+# Convert line endings.
+dos2unix --keepdate ChangeLog
%build
-autoreconf -fi
-%configure
-make %{?_smp_mflags}
+%cmake
+%cmake_build
%install
-make install DESTDIR=%{buildroot}
-mv %{buildroot}/usr/share/doc/log4cpp-%{version} rpmdocs
-rm -f %{buildroot}%{_libdir}/*.a
-rm -f %{buildroot}%{_libdir}/*.la
+%cmake_install
-%ldconfig_scriptlets
+%check
+%ctest
%files
-%{_libdir}/liblog4cpp.so.5*
-%doc ChangeLog COPYING
+%doc ChangeLog THANKS TODO
+%license COPYING
+%{_libdir}/liblog4cpp.so.5
+%{_libdir}/liblog4cpp.so.5.0.6
%files devel
-%{_bindir}/log4cpp-config
%{_includedir}/log4cpp/
%{_libdir}/liblog4cpp.so
-%{_libdir}/pkgconfig/log4cpp.pc
-%{_datadir}/aclocal/log4cpp.m4
-%{_mandir}/man3/log4cpp*
-
-%files doc
-%doc rpmdocs/*
+%{_libdir}/cmake/log4cpp/
%changelog
%autochangelog
diff --git a/sources b/sources
index 54df4dc..10eacd5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (log4cpp-1.1.3.tar.gz) = 88e5e10bce8d7d6421c3dcf14aa25385159c4ae52becdc1f3666ab86e1ad3f633786d82afe398c517d4faaa57b3e7b7c0b524361d81c6b9040dbded5cecc19de
+SHA512 (log4cpp-1.1.6.tar.gz) = 2159654c704a311af36f97e85c519e5bf60d4d470ef2fb5e0e9cd80c6fc76d450ad0d3069948010697ac20314461309773eb7cd5594a5c98407e9e6600741d87
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-01 7:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-01 7:14 [rpms/log4cpp] f44: Release 1.1.6 Antonio Trande
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox