[packages/log4cpp] - updated to 1.1.4, drop .la file

qboosh qboosh at pld-linux.org
Sun Apr 13 22:01:43 CEST 2025


commit fcedfd73c1da39e8f305a36c82e330f553682183
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 13 21:56:42 2025 +0200

    - updated to 1.1.4, drop .la file

 log4cpp-lt.patch     |  8 ++++----
 log4cpp-nolibs.patch | 22 +++++++++++-----------
 log4cpp.spec         | 12 +++++++-----
 3 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/log4cpp.spec b/log4cpp.spec
index 6356b36..371c1c7 100644
--- a/log4cpp.spec
+++ b/log4cpp.spec
@@ -5,12 +5,12 @@
 Summary:	Library for flexible logging
 Summary(pl.UTF-8):	Biblioteka do elastycznego logowania
 Name:		log4cpp
-Version:	1.1.1
-Release:	3
+Version:	1.1.4
+Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	https://downloads.sourceforge.net/log4cpp/%{name}-%{version}.tar.gz
-# Source0-md5:	1e173df8ee97205f412ff84aa93b8fbe
+# Source0-md5:	d56ef8240014528c354da5b7e93015ca
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-lt.patch
 Patch2:		%{name}-idsa.patch
@@ -83,7 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 	docdir=$RPM_BUILD_ROOT/removeit \
 	mandir=$RPM_BUILD_ROOT%{_mandir}
 
-rm -rf $RPM_BUILD_ROOT/removeit
+%{__rm} -r $RPM_BUILD_ROOT/removeit
+
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblog4cpp.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -102,7 +105,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/html/default.css doc/html/sflogo.png doc/html/index.html doc/html/api
 %attr(755,root,root) %{_bindir}/log4cpp-config
 %attr(755,root,root) %{_libdir}/liblog4cpp.so
-%{_libdir}/liblog4cpp.la
 %{_includedir}/log4cpp
 %{_mandir}/man3/log4cpp.3*
 %{_mandir}/man3/log4cpp::*.3*
diff --git a/log4cpp-lt.patch b/log4cpp-lt.patch
index 3f4a729..c0c3922 100644
--- a/log4cpp-lt.patch
+++ b/log4cpp-lt.patch
@@ -1,8 +1,8 @@
 Workaroud for libtool's -nostdlib (used with CXX tag) killing -lpthread normally implied by -pthread
---- log4cpp-1.0/src/Makefile.am.orig	2007-08-25 11:42:07.000000000 +0200
-+++ log4cpp-1.0/src/Makefile.am	2008-09-16 20:09:44.950783123 +0200
-@@ -57,3 +57,4 @@
- 	AbortAppender.cpp
+--- log4cpp/src/Makefile.am.orig	2023-03-12 17:46:57.000000000 +0100
++++ log4cpp/src/Makefile.am	2025-04-13 21:49:41.494247920 +0200
+@@ -65,3 +65,4 @@ liblog4cpp_la_SOURCES += SmtpAppender.cp
+ endif
  
  liblog4cpp_la_LDFLAGS = -version-info @LT_VERSION@
 +liblog4cpp_la_LIBADD = -lpthread
diff --git a/log4cpp-nolibs.patch b/log4cpp-nolibs.patch
index 735afd6..60af0c7 100644
--- a/log4cpp-nolibs.patch
+++ b/log4cpp-nolibs.patch
@@ -1,13 +1,13 @@
---- log4cpp-0.3.4b/configure.in.orig	2002-10-29 22:40:37.000000000 +0100
-+++ log4cpp-0.3.4b/configure.in	2003-12-21 21:40:15.760800432 +0100
-@@ -69,8 +69,8 @@
- # ----------------------------------------------------------------------------
+--- log4cpp/m4/BB_ENABLE_REMOTE_SYSLOG.m4.orig	2023-03-12 17:46:57.000000000 +0100
++++ log4cpp/m4/BB_ENABLE_REMOTE_SYSLOG.m4	2025-04-13 21:49:00.014472635 +0200
+@@ -4,8 +4,8 @@ AC_ARG_ENABLE(remote-syslog, [  --disabl
  
  # for RemoteSyslogAppender
--AC_CHECK_LIB(socket,socket, LIBS="-lsocket $LIBS",,)
--AC_CHECK_LIB(nsl,gethostbyname, LIBS="-lnsl $LIBS",,)
-+AC_SEARCH_LIBS(socket,socket)
-+AC_SEARCH_LIBS(gethostbyname,nsl)
- 
- # idsa_test
- if test "x$with_idsa" = xyes; then
+ if test "x$enable_remote_syslog" = xyes; then
+-    AC_CHECK_LIB(socket,socket, LIBS="-lsocket $LIBS",,)
+-    AC_CHECK_LIB(nsl,gethostbyname, LIBS="-lnsl $LIBS",,)
++    AC_SEARCH_LIBS(socket,socket)
++    AC_SEARCH_LIBS(gethostbyname,nsl)
+ else
+     AC_DEFINE(DISABLE_REMOTE_SYSLOG,1,[define if RemoteSyslogAppender is disabled])
+ fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/log4cpp.git/commitdiff/fcedfd73c1da39e8f305a36c82e330f553682183



More information about the pld-cvs-commit mailing list