rpms/twinkle/devel twinkle-1.2-gcc43.patch, NONE, 1.1 sources, 1.5, 1.6 .cvsignore, 1.5, 1.6 twinkle.spec, 1.10, 1.11 twinkle-1.1-gcc43.patch, 1.1, NONE

[Kevin Fenzi (kevin)]

Author: kevin

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

Modified Files:
	sources .cvsignore twinkle.spec 
Added Files:
	twinkle-1.2-gcc43.patch 
Removed Files:
	twinkle-1.1-gcc43.patch 
Log Message:
Update to 1.2


twinkle-1.2-gcc43.patch:

--- NEW FILE twinkle-1.2-gcc43.patch ---
diff -Nur twinkle-1.2.orig/src/sockets/socket.cpp twinkle-1.2/src/sockets/socket.cpp
--- twinkle-1.2.orig/src/sockets/socket.cpp	2008-02-26 14:10:50.000000000 -0700
+++ twinkle-1.2/src/sockets/socket.cpp	2008-03-08 18:07:16.000000000 -0700
@@ -133,7 +133,7 @@
 	return ret;
 }
 
-int t_socket_udp::send(const void *data, int data_size) {
+ssize_t t_socket_udp::send(const void *data, int data_size) {
 	int ret = ::send(sd, data, data_size, 0);
 	if (ret < 0) throw errno;
 
diff -Nur twinkle-1.2.orig/src/sockets/url.cpp twinkle-1.2/src/sockets/url.cpp
--- twinkle-1.2.orig/src/sockets/url.cpp	2008-03-01 23:52:56.000000000 -0700
+++ twinkle-1.2/src/sockets/url.cpp	2008-03-08 17:44:34.000000000 -0700
@@ -28,6 +28,7 @@
 #include "socket.h"
 #include "url.h"
 #include "util.h"
+#include <cstring>
 
 // TODO: handle hex charactest (eg. %20x) correctly.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Aug 2007 03:57:16 -0000	1.5
+++ sources	9 Mar 2008 01:19:05 -0000	1.6
@@ -1 +1 @@
-40f8341a4a82c06d00bd1b326d9c6bbf  twinkle-1.1.tar.gz
+5f396d9367d7260732298c821639773b  twinkle-1.2.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Aug 2007 03:57:16 -0000	1.5
+++ .cvsignore	9 Mar 2008 01:19:05 -0000	1.6
@@ -1 +1 @@
-twinkle-1.1.tar.gz
+twinkle-1.2.tar.gz


Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- twinkle.spec	9 Feb 2008 23:01:33 -0000	1.10
+++ twinkle.spec	9 Mar 2008 01:19:05 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           twinkle
-Version:        1.1
-Release:        5%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
@@ -8,7 +8,7 @@
 URL:            http://www.twinklephone.com
 Source0:        http://www.xs4all.nl/~mfnboer/twinkle/download/%{name}-%{version}.tar.gz
 Patch0:         twinkle-1.1-msg.patch
-Patch1:		twinkle-1.1-gcc43.patch
+Patch1:		twinkle-1.2-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: commoncpp2-devel
@@ -29,7 +29,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .msg
-%patch1 -p1 -b .gcc
+%patch1 -p1 -b .gcc43
 
 %build
 %configure
@@ -62,6 +62,9 @@
 %{_datadir}/applications/fedora-twinkle.desktop
 
 %changelog
+* Sat Mar 08 2008 Kevin Fenzi <kevin at tummy.com> - 1.2-1
+- Update to 1.2
+
 * Sat Feb 09 2008 Kevin Fenzi <kevin at tummy.com> - 1.1-5
 - Rebuild for gcc-4.3
 - Rebuild for new cctrp and commoncpp2


--- twinkle-1.1-gcc43.patch DELETED ---