rpms/log4cxx/F-11 log4cxx-cstring.patch, 1.2, 1.3 log4cxx.spec, 1.2, 1.3

Miloš Jakubíček mjakubicek at fedoraproject.org
Sat Apr 25 20:27:17 UTC 2009


Author: mjakubicek

Update of /cvs/pkgs/rpms/log4cxx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17678/F-11

Modified Files:
	log4cxx-cstring.patch log4cxx.spec 
Log Message:
- Fix FTBFS: updated log4cxx-cstring.patch for gcc 4.4



log4cxx-cstring.patch:

Index: log4cxx-cstring.patch
===================================================================
RCS file: /cvs/pkgs/rpms/log4cxx/F-11/log4cxx-cstring.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log4cxx-cstring.patch	26 Feb 2009 12:20:17 -0000	1.2
+++ log4cxx-cstring.patch	25 Apr 2009 20:26:46 -0000	1.3
@@ -1,12 +1,13 @@
 diff -ur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0.new/src/examples/cpp/console.cpp
 --- apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp	2008-03-31 18:34:52.000000000 -0400
 +++ apache-log4cxx-0.10.0.new/src/examples/cpp/console.cpp	2008-11-16 17:01:37.000000000 -0500
-@@ -22,6 +22,8 @@
+@@ -22,6 +22,9 @@
  #include <log4cxx/logmanager.h>
  #include <iostream>
  #include <locale.h>
 +#include <cstring>
 +#include <cstdio>
++#include <stdint.h>
  
  using namespace log4cxx;
  using namespace log4cxx::helpers;


Index: log4cxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/log4cxx/F-11/log4cxx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log4cxx.spec	25 Feb 2009 20:50:05 -0000	1.2
+++ log4cxx.spec	25 Apr 2009 20:26:46 -0000	1.3
@@ -1,12 +1,14 @@
 Name: log4cxx
 Version: 0.10.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A port to C++ of the Log4j project
 
 Group: System Environment/Libraries
 License: ASL 2.0
 URL: http://logging.apache.org/log4cxx/index.html
 Source0: http://www.apache.org/dist/logging/log4cxx/%{version}/apache-%{name}-%{version}.tar.gz
+# Filed into upstream bugtracker at:
+# https://issues.apache.org/jira/browse/LOGCXX-332
 Patch0: log4cxx-cstring.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,7 +30,7 @@
  '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64 |' \
  configure
 %configure
-make %{?_smp_mflags}
+make -k %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +69,9 @@
 %doc html/
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.10.0-7
+- Fix FTBFS: updated log4cxx-cstring.patch for gcc 4.4
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list