rpms/libwvstreams/devel libwvstreams-4.4.1-gcc43.patch, NONE, 1.1 libwvstreams.spec, 1.29, 1.30 libwvstreams-3.70-gcc3.patch, 1.2, NONE libwvstreams-4.3-gcc41.patch, 1.1, NONE

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/libwvstreams/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11615

Modified Files:
	libwvstreams.spec 
Added Files:
	libwvstreams-4.4.1-gcc43.patch 
Removed Files:
	libwvstreams-3.70-gcc3.patch libwvstreams-4.3-gcc41.patch 
Log Message:
gcc43 rebuild + required changes

libwvstreams-4.4.1-gcc43.patch:

--- NEW FILE libwvstreams-4.4.1-gcc43.patch ---
diff -urNp wvstreams-4.4.1-orig/include/iwvstream.h wvstreams-4.4.1/include/iwvstream.h
--- wvstreams-4.4.1-orig/include/iwvstream.h	2007-08-17 07:15:30.000000000 +0200
+++ wvstreams-4.4.1/include/iwvstream.h	2008-02-12 14:24:23.000000000 +0100
@@ -11,6 +11,7 @@
 #include "wvcallback.h"
 #include "wvbuf.h"
 #include "wvxplc.h"
+#include <climits>
 
 
 class WvAddr;
diff -urNp wvstreams-4.4.1-orig/include/uniconfkey.h wvstreams-4.4.1/include/uniconfkey.h
--- wvstreams-4.4.1-orig/include/uniconfkey.h	2007-07-19 23:22:49.000000000 +0200
+++ wvstreams-4.4.1/include/uniconfkey.h	2008-02-12 14:23:50.000000000 +0100
@@ -9,6 +9,7 @@
 
 #include "wvstring.h"
 #include "wvlinklist.h"
+#include <climits>
 
 
 // The Python headers try to #define ANY as void.  If we're building Python
diff -urNp wvstreams-4.4.1-orig/include/wvserialize.h wvstreams-4.4.1/include/wvserialize.h
--- wvstreams-4.4.1-orig/include/wvserialize.h	2007-08-17 07:15:30.000000000 +0200
+++ wvstreams-4.4.1/include/wvserialize.h	2008-02-12 16:33:44.000000000 +0100
@@ -348,8 +348,8 @@ template <> 
  * (zero) character.  Serialized WvStrings are guaranteed not to contain nul
  * except as the last character.
  */
-template <>
-extern WvString _wv_deserialize<WvString>(WvBuf &buf);
+//template <>
+//extern WvString _wv_deserialize<WvString>(WvBuf &buf); 
 
 
 /** Deserialize a WvBuf. */
@@ -358,7 +358,7 @@ template <>
 class WvDeserialize<WvBuf *>
 {
 public:
-    static inline WvBuf *go(WvBuf &buf)
+    static WvBuf *go(WvBuf &buf)
     {
 	size_t len = wv_deserialize<size_t>(buf);
 	WvBuf *outbuf = new WvInPlaceBuf(new char[len], 0, len, true);
diff -urNp wvstreams-4.4.1-orig/uniconf/uniconf.cc wvstreams-4.4.1/uniconf/uniconf.cc
--- wvstreams-4.4.1-orig/uniconf/uniconf.cc	2007-07-19 23:22:35.000000000 +0200
+++ wvstreams-4.4.1/uniconf/uniconf.cc	2008-02-12 15:04:45.000000000 +0100
@@ -8,6 +8,7 @@
 #include "uniconfroot.h"
 #include "uniconfgen.h"
 #include "wvstream.h"
+#include <climits>
 #include <assert.h>
 

diff -urNp wvstreams-4.4.1-orig/utils/wvargs.cc wvstreams-4.4.1/utils/wvargs.cc
--- wvstreams-4.4.1-orig/utils/wvargs.cc	2007-08-17 07:15:30.000000000 +0200
+++ wvstreams-4.4.1/utils/wvargs.cc	2008-02-12 14:25:38.000000000 +0100
@@ -15,6 +15,7 @@
 #undef __argv
 
 #include <argp.h>
+#include <climits>
 
 
 class WvArgsOption
diff -urNp wvstreams-4.4.1-orig/utils/wvtclstring.cc wvstreams-4.4.1/utils/wvtclstring.cc
--- wvstreams-4.4.1-orig/utils/wvtclstring.cc	2007-07-19 23:22:55.000000000 +0200
+++ wvstreams-4.4.1/utils/wvtclstring.cc	2008-02-12 14:25:56.000000000 +0100
@@ -8,6 +8,7 @@
 #include "wvstring.h"
 #include "wvstringmask.h"
 #include "wvtclstring.h"
+#include <climits>
 
 const WvStringMask WVTCL_NASTY_SPACES(WVTCL_NASTY_SPACES_STR);
 const WvStringMask WVTCL_NASTY_NEWLINES(WVTCL_NASTY_NEWLINES_STR);
diff -urNp wvstreams-4.4.1-orig/utils/wvtimeutils.cc wvstreams-4.4.1/utils/wvtimeutils.cc
--- wvstreams-4.4.1-orig/utils/wvtimeutils.cc	2007-07-19 23:22:55.000000000 +0200
+++ wvstreams-4.4.1/utils/wvtimeutils.cc	2008-02-12 14:25:15.000000000 +0100
@@ -4,7 +4,7 @@
  *
  * Various little time functions...
  */
-#include <limits.h>
+#include <climits>
 
 #include "wvtimeutils.h"
 



Index: libwvstreams.spec
===================================================================
RCS file: /cvs/extras/rpms/libwvstreams/devel/libwvstreams.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libwvstreams.spec	5 Dec 2007 11:09:44 -0000	1.29
+++ libwvstreams.spec	12 Feb 2008 17:51:08 -0000	1.30
@@ -1,10 +1,11 @@
 Name: libwvstreams
 Version: 4.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: WvStreams is a network programming library written in C++
 Source: http://wvstreams.googlecode.com/files/wvstreams-%{version}.tar.gz
 Patch1: wvstreams-4.2.2-multilib.patch
 Patch2: wvstreams-4.4-no_sarestorer.patch
+Patch3: libwvstreams-4.4.1-gcc43.patch
 URL: http://alumnit.ca/wiki/index.php?page=WvStreams
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,6 +30,7 @@
 %setup -q -n wvstreams-%{version}
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .no_sarestore
+%patch3 -p1 -b .gcc43
 
 %build
 #  --with-fam              FAM
@@ -90,6 +92,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Feb 12 2008 Ondrej Vasik <ovasik at redhat.com> - 4.4.1-4
+- gcc43 rebuild, climits instead limits.h usage
+
 * Wed Dec 05 2007 Ondrej Vasik <ovasik at redhat.com> - 4.4.1-3
 - rebuilt because of new OpenSSL
 


--- libwvstreams-3.70-gcc3.patch DELETED ---


--- libwvstreams-4.3-gcc41.patch DELETED ---