rpms/loki-lib/devel loki-gcc43.patch, NONE, 1.1 loki-lib.spec, 1.3, 1.4

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/loki-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv487

Modified Files:
	loki-lib.spec 
Added Files:
	loki-gcc43.patch 
Log Message:
* Thu Feb 21 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 0.1.6-6
- Patch to build with GCC 4.3


loki-gcc43.patch:

--- NEW FILE loki-gcc43.patch ---
diff -ur loki-0.1.6/include/loki/SafeFormat.h loki-0.1.6.gcc43/include/loki/SafeFormat.h
--- loki-0.1.6/include/loki/SafeFormat.h	2006-10-17 21:48:40.000000000 +0200
+++ loki-0.1.6.gcc43/include/loki/SafeFormat.h	2008-02-21 19:44:55.000000000 +0100
@@ -26,6 +26,8 @@
 #include <stdexcept>
 #include <utility>
 #include <cassert>
+#include <cstring>
+#include <climits>
 #include <locale>
 #include <iostream>
 
@@ -205,7 +207,7 @@
                 result_ = -1;
                 return *this;
             }
-            const size_t len = std::min(strlen(s), prec_);
+            const size_t len = std::min(std::strlen(s), prec_);
             if (width_ > len) {
                 if (LeftJustify()) {
                     Write(s, s + len);
@@ -380,7 +382,7 @@
                 result_ = -1;
                 return;
             }
-            Write(resultBuf, resultBuf + strlen(resultBuf));
+            Write(resultBuf, resultBuf + std::strlen(resultBuf));
             Advance(); // output stuff to the next format directive
         }
 
diff -ur loki-0.1.6/src/SmallObj.cpp loki-0.1.6.gcc43/src/SmallObj.cpp
--- loki-0.1.6/src/SmallObj.cpp	2006-10-17 22:05:42.000000000 +0200
+++ loki-0.1.6.gcc43/src/SmallObj.cpp	2008-02-21 19:45:59.000000000 +0100
@@ -19,6 +19,7 @@
 #include <loki/SmallObj.h>
 
 #include <cassert>
+#include <climits>
 #include <vector>
 #include <bitset>
 


Index: loki-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/loki-lib/devel/loki-lib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- loki-lib.spec	19 Feb 2008 23:39:01 -0000	1.3
+++ loki-lib.spec	21 Feb 2008 18:56:28 -0000	1.4
@@ -2,7 +2,7 @@
 %define majorversion 0
 Name: %{upname}-lib
 Version: 0.1.6
-Release: 5%{?dist}.1
+Release: 6%{?dist}
 Summary: Loki C++ Library of design patterns and idioms
 
 Group: Development/Libraries
@@ -12,7 +12,8 @@
 Patch0: loki-makefile.patch
 Patch1: loki-makefile-test.patch
 Patch2: loki-makefile-test-parallel.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch3: loki-gcc43.patch
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -40,6 +41,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %{__chmod} -x doc/html/*
 %{__rm} doc/html/installdox
 
@@ -81,24 +83,34 @@
 %doc doc/html doc/flex doc/yasli
 
 %changelog
+* Thu Feb 21 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 0.1.6-6
+- Patch to build with GCC 4.3
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.6-5.1
 - Autorebuild for GCC 4.3
 
 * Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-4.1
 - Rebuild for Fedora 8 by bad binutils in ppc32
+
 * Thu Jul 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-4
 - Installing libraries in _libdir instead of prefix/lib
+
 * Tue Jul 03 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-3
 - Header files in directory loki
+
 * Sun Jul 01 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-2
 - Disabled test suite, does not work in x86_64
 - Added requires for -devel package
+
 * Tue Jun 26 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-1
 - fixed installation of .h files
 - fixed version number
+
 * Tue Jun 11 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-0.3
 - Removed the unused dependency to libm in the dynamic library
+
 * Mon Jun 11 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-0.2
 - Removed the unused dependency to libpthread in the dynamic library
+
 * Thu Jun 07 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 0.1.6-0.1
 - Initial fedora rpm release