[packages/log4c] - updated to 1.2.4 - updated doc patch - removed obsolete m4 patch - added format patch (fixes build
qboosh
qboosh at pld-linux.org
Sat Jun 30 08:58:19 CEST 2018
commit 82d2007ed90a916d49ac16df0f24e5defd1ece76
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jun 30 08:59:41 2018 +0200
- updated to 1.2.4
- updated doc patch
- removed obsolete m4 patch
- added format patch (fixes build with -Werror=format-security)
log4c-doc.patch | 16 ++++++--------
log4c-format.patch | 11 +++++++++
log4c-m4.patch | 11 ---------
log4c.spec | 65 +++++++++++++++++++++++++++++++++++-------------------
4 files changed, 60 insertions(+), 43 deletions(-)
---
diff --git a/log4c.spec b/log4c.spec
index 60444e1..a61c54e 100644
--- a/log4c.spec
+++ b/log4c.spec
@@ -1,23 +1,23 @@
Summary: Library for flexible logging
Summary(pl.UTF-8): Biblioteka do elastycznego logowania
Name: log4c
-Version: 1.2.1
+Version: 1.2.4
Release: 1
-License: LGPL
-Group: Development/Libraries
-Source0: http://dl.sourceforge.net/log4c/%{name}-%{version}.tar.gz
-# Source0-md5: ca5412b7515d8901714ab7892323adb6
+License: LGPL v2.1+
+Group: Libraries
+Source0: http://downloads.sourceforge.net/log4c/%{name}-%{version}.tar.gz
+# Source0-md5: 0d94919136e1d16b68427562e74cb3dd
Patch0: %{name}-nolatex.patch
Patch1: %{name}-doc.patch
Patch2: %{name}-cxx.patch
-Patch3: %{name}-m4.patch
-URL: http://log4cpp.sourceforge.net/
-BuildRequires: autoconf
-BuildRequires: automake
+Patch3: %{name}-format.patch
+URL: http://log4c.sourceforge.net/
+BuildRequires: autoconf >= 2.57
+BuildRequires: automake >= 1:1.7
BuildRequires: doxygen
-BuildRequires: libtool
-BuildRequires: expat-devel
+BuildRequires: expat-devel >= 1.95.1
BuildRequires: graphviz
+BuildRequires: libtool >= 1.4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -50,15 +50,25 @@ This package contains static log4c library.
%description static -l pl.UTF-8
Ten pakiet zawiera statyczną bibliotekę log4c.
+%package apidocs
+Summary: API documentation for log4c library
+Summary(pl.UTF-8): Dokumentacja API biblioteki log4c
+Group: Documentation
+
+%description apidocs
+API documentation for log4c library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki log4c.
+
%prep
%setup -q
%patch0
%patch1 -p1
%patch2
-%patch3
+%patch3 -p1
%build
-rm -f missing
%{__libtoolize}
%{__aclocal} -Iconfig
%{__autoconf}
@@ -75,8 +85,11 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT \
docdir=/removeit
-rm -rf $RPM_BUILD_ROOT/removeit
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblog4c.la
+
+%{__rm} -r $RPM_BUILD_ROOT/removeit
+%{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -87,18 +100,24 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README log4crc.sample
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_libdir}/liblog4c.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblog4c.so.3
%files devel
%defattr(644,root,root,755)
-%doc doc/html/*
%attr(755,root,root) %{_bindir}/log4c-config
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*
-%{_mandir}/man3/*
-%{_aclocaldir}/*.m4
+%attr(755,root,root) %{_libdir}/liblog4c.so
+%{_includedir}/log4c
+%{_includedir}/log4c.h
+%{_pkgconfigdir}/log4c.pc
+%{_mandir}/man1/log4c-config.1*
+%{_mandir}/man3/log4c_*.3*
+%{_aclocaldir}/log4c.m4
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/liblog4c.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/html/*
diff --git a/log4c-doc.patch b/log4c-doc.patch
index 9d34db9..cda46bc 100644
--- a/log4c-doc.patch
+++ b/log4c-doc.patch
@@ -1,7 +1,6 @@
-diff -Nur log4c-1.0.10.orig/doc/main.doc.in log4c-1.0.10.chng/doc/main.doc.in
---- log4c-1.0.10.orig/doc/main.doc.in Thu Nov 21 16:43:29 2002
-+++ log4c-1.0.10.chng/doc/main.doc.in Mon Aug 4 12:53:16 2003
-@@ -123,29 +123,30 @@
+--- log4c-1.2.4/doc/main.doc.in.orig 2018-06-30 08:14:13.679994625 +0200
++++ log4c-1.2.4/doc/main.doc.in 2018-06-30 08:28:28.526651532 +0200
+@@ -105,29 +105,29 @@
@subsection conf_syntax Configuration syntax
The @c log4crc configuration file uses an XML syntax. The root element is
@@ -9,8 +8,7 @@ diff -Nur log4c-1.0.10.orig/doc/main.doc.in log4c-1.0.10.chng/doc/main.doc.in
+ at c <log4c> and it can be used to control the configuration file version
interface with the attribute @c "version". The following 4 elements are
-supported: @c <config>, @c <category>, @c <appender> and @c <layout>.
-+supported: @c <config>, @c <category>, @c <appender> and
-+ at c <layout>.
++supported: @c <config>, @c <category>, @c <appender> and @c <layout>.
- at li The @c <config> element controls the global log4c configuration. It has
-3 sub elements. The @c <nocleanup> flag inhibits the log4c destructors
@@ -25,7 +23,7 @@ diff -Nur log4c-1.0.10.orig/doc/main.doc.in log4c-1.0.10.chng/doc/main.doc.in
- at li The @c <category> element has 3 possible attributes: the category @c
+ at li The @c <category> element has 3 possible attributes: the category @c
"name", the category @c "priority" and the category @c "appender". Future
- versions will handle multple appenders per category.
+ versions will handle multiple appenders per category.
- at li The @c <appender> element has 3 possible attributes: the appender @c
+ at li The @c <appender> element has 3 possible attributes: the appender @c
@@ -35,9 +33,9 @@ diff -Nur log4c-1.0.10.orig/doc/main.doc.in log4c-1.0.10.chng/doc/main.doc.in
+ at li The @c <layout> element has 2 possible attributes: the layout @c "name" and
the layout @c "type".
- Here's the default @c log4crc configuration file:
+ Here's the @c log4crc configuration file example:
-- at include log4crc
+- at include log4crc.sample
+ at include ../log4crc.sample
This initial version of the log4c configuration file syntax is quite
diff --git a/log4c-format.patch b/log4c-format.patch
new file mode 100644
index 0000000..ba14dd8
--- /dev/null
+++ b/log4c-format.patch
@@ -0,0 +1,11 @@
+--- log4c-1.2.4/examples/helloworld1/mylog.h.orig 2006-11-12 01:34:18.000000000 +0100
++++ log4c-1.2.4/examples/helloworld1/mylog.h 2018-06-30 08:31:50.956649220 +0200
+@@ -39,7 +39,7 @@
+
+ static LOG4C_INLINE void mylog_msg(char *catName,int a_priority, char *msg){
+ #ifndef WITHOUT_LOG4C
+- log4c_category_log(log4c_category_get(catName), a_priority, msg);
++ log4c_category_log(log4c_category_get(catName), a_priority, "%s", msg);
+ #else
+ printf(msg);
+ #endif
diff --git a/log4c-m4.patch b/log4c-m4.patch
deleted file mode 100644
index a4d9563..0000000
--- a/log4c-m4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- log4c.m4.orig 2010-05-19 15:15:14.000000000 +0200
-+++ log4c.m4 2010-05-19 15:15:26.000000000 +0200
-@@ -4,7 +4,7 @@
- dnl AM_PATH_LOG4C([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for LOG4C, and define LOG4C_CFLAGS and LOG4C_LIBS
- dnl
--AC_DEFUN(AM_PATH_LOG4C,
-+AC_DEFUN([AM_PATH_LOG4C],
- [dnl
- dnl Get the cflags and libraries from the log4c-config script
- dnl
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/log4c.git/commitdiff/82d2007ed90a916d49ac16df0f24e5defd1ece76
More information about the pld-cvs-commit
mailing list