[libclaw/f14/master] fix incorrect typing

[Tom Callaway]

commit 228e1d07138b0be208b5d9e6d12fe85aeae9cfa3
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Sat Sep 18 12:38:45 2010 +0200

    fix incorrect typing

 libclaw-1.5.4-svn172.patch |   12 ++++++++++++
 libclaw-1.5.4-svn194.patch |   21 +++++++++++++++++++++
 libclaw-1.5.4-svn195.patch |   21 +++++++++++++++++++++
 libclaw.spec               |   20 +++++++++++++++++++-
 4 files changed, 73 insertions(+), 1 deletions(-)
---
diff --git a/libclaw-1.5.4-svn172.patch b/libclaw-1.5.4-svn172.patch
new file mode 100644
index 0000000..951f82f
--- /dev/null
+++ b/libclaw-1.5.4-svn172.patch
@@ -0,0 +1,12 @@
+diff -up libclaw-1.5.4/claw/impl/logger.tpp.svn172 libclaw-1.5.4/claw/impl/logger.tpp
+--- libclaw-1.5.4/claw/impl/logger.tpp.svn172	2010-09-18 12:02:57.083920023 +0200
++++ libclaw-1.5.4/claw/impl/logger.tpp	2010-09-18 12:03:02.535920075 +0200
+@@ -36,7 +36,7 @@
+  * \remark T must support operator<<(std::ostream&, const T&);
+  */
+ template<class T>
+-claw::log_system::log_system& claw::log_system::operator<<( const T& t )
++claw::log_system& claw::log_system::operator<<( const T& t )
+ {
+   if (m_message_level <= m_log_level)
+     {
diff --git a/libclaw-1.5.4-svn194.patch b/libclaw-1.5.4-svn194.patch
new file mode 100644
index 0000000..12d3a92
--- /dev/null
+++ b/libclaw-1.5.4-svn194.patch
@@ -0,0 +1,21 @@
+diff -up libclaw-1.5.4/claw/code/basic_socket.cpp.svn194 libclaw-1.5.4/claw/code/basic_socket.cpp
+--- libclaw-1.5.4/claw/code/basic_socket.cpp.svn194	2010-09-18 12:10:39.297919980 +0200
++++ libclaw-1.5.4/claw/code/basic_socket.cpp	2010-09-18 12:11:03.708919996 +0200
+@@ -45,7 +45,7 @@ claw::net::basic_socket::basic_socket()
+  * \brief Open the socket.
+  * \return this is everything works fine, NULL otherwise.
+  */
+-claw::net::basic_socket::basic_socket* claw::net::basic_socket::open()
++claw::net::basic_socket* claw::net::basic_socket::open()
+ {
+   basic_socket* result = NULL;
+   
+@@ -62,7 +62,7 @@ claw::net::basic_socket::basic_socket* c
+  * \brief Close the socket.
+  * \return this if everything works fine, NULL otherwise.
+  */
+-claw::net::basic_socket::basic_socket* claw::net::basic_socket::close()
++claw::net::basic_socket* claw::net::basic_socket::close()
+ {
+   basic_socket* result = this;
+ 
diff --git a/libclaw-1.5.4-svn195.patch b/libclaw-1.5.4-svn195.patch
new file mode 100644
index 0000000..e977405
--- /dev/null
+++ b/libclaw-1.5.4-svn195.patch
@@ -0,0 +1,21 @@
+diff -up libclaw-1.5.4/claw/code/socket_server.cpp.svn195 libclaw-1.5.4/claw/code/socket_server.cpp
+--- libclaw-1.5.4/claw/code/socket_server.cpp.svn195	2010-09-18 12:07:14.869920001 +0200
++++ libclaw-1.5.4/claw/code/socket_server.cpp	2010-09-18 12:07:31.108920003 +0200
+@@ -58,7 +58,7 @@ claw::net::socket_server::socket_server(
+  * \param queue_size The size of the waiting queue for incoming connections.
+  * \return this if everything works fine, NULL otherwise.
+  */
+-claw::net::socket_server::socket_server*
++claw::net::socket_server*
+ claw::net::socket_server::open( int port, unsigned int queue_size )
+ {
+   socket_server* result = NULL;
+@@ -78,7 +78,7 @@ claw::net::socket_server::open( int port
+ /**
+  * \brief Close the socket.
+  */
+-claw::net::socket_server::socket_server* claw::net::socket_server::close()
++claw::net::socket_server* claw::net::socket_server::close()
+ {
+   if ( basic_socket::close() )
+     return this;
diff --git a/libclaw.spec b/libclaw.spec
index 83168a1..95a3b3f 100644
--- a/libclaw.spec
+++ b/libclaw.spec
@@ -1,6 +1,6 @@
 Name:           libclaw
 Version:        1.5.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C++ Library of various utility functions
 
 Group:          System Environment/Libraries
@@ -9,6 +9,17 @@ URL:            http://libclaw.sourceforge.net/
 Source0:        http://dl.sourceforge.net/project/%{name}/%{version}/%{name}-%{version}.tar.gz
 Patch0:         libclaw-1.5.4-nostrip.patch
 Patch1:         libclaw-1.5.4-libdir.patch
+# Fix wrong return type of 'claw::log_system::operator<<'
+# SVN172
+# http://libclaw.svn.sourceforge.net/viewvc/libclaw?view=revision&revision=172
+Patch2:         libclaw-1.5.4-svn172.patch
+# Fix incorrect return type in basic_socket.
+# SVN194, 195
+# http://libclaw.svn.sourceforge.net/viewvc/libclaw?view=revision&revision=194
+# http://libclaw.svn.sourceforge.net/viewvc/libclaw?view=revision&revision=195
+Patch3:         libclaw-1.5.4-svn194.patch
+Patch4:         libclaw-1.5.4-svn195.patch
+
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  libjpeg-devel
@@ -37,6 +48,9 @@ Claw (C++ Library Absolutely Wonderful).
 %setup -q
 %patch0 -p1 -b .nostrip
 %patch1 -p1 -b .libdir
+%patch2 -p1 -b .svn172
+%patch3 -p1 -b .svn194
+%patch4 -p1 -b .svn195
 
 
 %build
@@ -82,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 18 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.4-4
+- Fix wrong return type of 'claw::log_system::operator<<'
+- Fix incorrect return type in basic_socket.
+
 * Fri Oct 23 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.5.4-3
 - Really fix the examples encoding