rpms/vdccm/devel vdccm-includes.patch, NONE, 1.1 vdccm.spec, 1.6, 1.7 vdccm-gcc43.patch, 1.5, NONE

Caolan McNamara caolanm at fedoraproject.org
Fri Mar 6 13:20:59 UTC 2009


Author: caolanm

Update of /cvs/pkgs/rpms/vdccm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29919

Modified Files:
	vdccm.spec 
Added Files:
	vdccm-includes.patch 
Removed Files:
	vdccm-gcc43.patch 
Log Message:
fix build

vdccm-includes.patch:

--- NEW FILE vdccm-includes.patch ---
diff -ru vdccm-0.10.1.orig/lib/localconnectedsocket.cpp vdccm-0.10.1/lib/localconnectedsocket.cpp
--- vdccm-0.10.1.orig/lib/localconnectedsocket.cpp	2009-03-06 12:47:32.000000000 +0000
+++ vdccm-0.10.1/lib/localconnectedsocket.cpp	2009-03-06 13:15:37.000000000 +0000
@@ -22,6 +22,7 @@
  ***************************************************************************/
 #include "localconnectedsocket.h"
 #include <netdb.h>
+#include <string.h>
 
 using namespace std;
 
diff -ru vdccm-0.10.1.orig/lib/tcpclientsocket.cpp vdccm-0.10.1/lib/tcpclientsocket.cpp
--- vdccm-0.10.1.orig/lib/tcpclientsocket.cpp	2009-03-06 12:47:32.000000000 +0000
+++ vdccm-0.10.1/lib/tcpclientsocket.cpp	2009-03-06 13:15:37.000000000 +0000
@@ -22,6 +22,7 @@
  ***************************************************************************/
 #include "tcpclientsocket.h"
 #include <netdb.h>
+#include <string.h>
 
 using namespace std;
 
diff -ru vdccm-0.10.1.orig/lib/tcpconnectedsocket.cpp vdccm-0.10.1/lib/tcpconnectedsocket.cpp
--- vdccm-0.10.1.orig/lib/tcpconnectedsocket.cpp	2009-03-06 12:47:32.000000000 +0000
+++ vdccm-0.10.1/lib/tcpconnectedsocket.cpp	2009-03-06 13:15:37.000000000 +0000
@@ -23,6 +23,7 @@
 #include "tcpconnectedsocket.h"
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <string.h>
 
 // Ugly hack - the header <linux/in.h> could not be included
 // due to conflicts with other systemheader
diff -ru vdccm-0.10.1.orig/lib/tcpsocket.cpp vdccm-0.10.1/lib/tcpsocket.cpp
--- vdccm-0.10.1.orig/lib/tcpsocket.cpp	2009-03-06 12:47:32.000000000 +0000
+++ vdccm-0.10.1/lib/tcpsocket.cpp	2009-03-06 13:15:37.000000000 +0000
@@ -23,7 +23,7 @@
 #include "tcpsocket.h"
 #include <arpa/inet.h>
 #include <netdb.h>
-
+#include <string.h>
 
 using namespace std;
 
diff -ru vdccm-0.10.1.orig/lib/udpsocket.cpp vdccm-0.10.1/lib/udpsocket.cpp
--- vdccm-0.10.1.orig/lib/udpsocket.cpp	2009-03-06 12:47:32.000000000 +0000
+++ vdccm-0.10.1/lib/udpsocket.cpp	2009-03-06 13:15:37.000000000 +0000
@@ -11,6 +11,7 @@
 //
 #include "udpsocket.h"
 #include <netdb.h>
+#include <string.h>
 
 using namespace std;
 
diff -ru vdccm-0.10.1.orig/lib/udpsocket.h vdccm-0.10.1/lib/udpsocket.h
--- vdccm-0.10.1.orig/lib/udpsocket.h	2009-03-06 12:47:32.000000000 +0000
+++ vdccm-0.10.1/lib/udpsocket.h	2009-03-06 12:48:21.000000000 +0000
@@ -13,6 +13,7 @@
 #define UDPSOCKET_H
 
 #include <netsocket.h>
+#include <stdint.h>
 #include <string>
 
 /**
diff -ru vdccm-0.10.1.orig/src/rapiclient.cpp vdccm-0.10.1/src/rapiclient.cpp
--- vdccm-0.10.1.orig/src/rapiclient.cpp	2009-03-06 12:47:32.000000000 +0000
+++ vdccm-0.10.1/src/rapiclient.cpp	2009-03-06 13:15:37.000000000 +0000
@@ -19,6 +19,7 @@
 #include <iomanip>
 #include <errno.h>
 #include <synce.h>
+#include <string.h>
 
 
 using namespace std;
diff -ru vdccm-0.10.1.orig/src/rapiclient.h vdccm-0.10.1/src/rapiclient.h
--- vdccm-0.10.1.orig/src/rapiclient.h	2009-03-06 12:47:32.000000000 +0000
+++ vdccm-0.10.1/src/rapiclient.h	2009-03-06 13:15:37.000000000 +0000
@@ -14,6 +14,8 @@
 
 #include <tcpacceptedsocket.h>
 
+#include <limits.h>
+
 /**
 	@author Volker Christian <voc at users.sourceforge.net>
 */
diff -ru vdccm-0.10.1.orig/src/rapiconnection.cpp vdccm-0.10.1/src/rapiconnection.cpp
--- vdccm-0.10.1.orig/src/rapiconnection.cpp	2009-03-06 12:47:32.000000000 +0000
+++ vdccm-0.10.1/src/rapiconnection.cpp	2009-03-06 13:15:48.000000000 +0000
@@ -22,6 +22,8 @@
 #include "synce_log.h"
 #include <algorithm>
 #include <multiplexer.h>
+#include <string.h>
+#include <stdio.h>
 
 using namespace std;
 
Only in vdccm-0.10.1/src: rapiconnection.cpp.orig
Only in vdccm-0.10.1/src: rapiconnection.cpp.rej
diff -ru vdccm-0.10.1.orig/src/rapiproxyconnection.cpp vdccm-0.10.1/src/rapiproxyconnection.cpp
--- vdccm-0.10.1.orig/src/rapiproxyconnection.cpp	2009-03-06 12:47:32.000000000 +0000
+++ vdccm-0.10.1/src/rapiproxyconnection.cpp	2009-03-06 13:15:37.000000000 +0000
@@ -19,6 +19,8 @@
 
 #include <iostream>
 
+#include <string.h>
+
 RapiProxyConnection::RapiProxyConnection(RapiConnection *rapiConnection, RapiProxy *rapiProxy,
                                          RapiProvisioningClient *rapiProvisioningClient)
     : rapiConnection(rapiConnection),


Index: vdccm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdccm/devel/vdccm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vdccm.spec	25 Feb 2009 23:53:50 -0000	1.6
+++ vdccm.spec	6 Mar 2009 13:20:29 -0000	1.7
@@ -1,13 +1,13 @@
 Name:           vdccm
 Version:        0.10.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Serial connection daemon for Pocket PC devices
 
 Group:          Applications/Communications
 License:        MIT
 URL:            http://www.synce.org
 Source0:        http://download.sf.net/synce/vdccm-%{version}.tar.gz
-Patch0:        %{name}-gcc43.patch
+Patch0:        %{name}-includes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsynce-devel >= 0.10.0
@@ -33,7 +33,7 @@
 %prep
 %setup -q
 sed -i -e "/chown root/d" src/Makefile.in
-%patch0
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -67,6 +67,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Mar 05 2009 Caolán McNamara <caolanm at redhat.com> - 0.10.1-5
+- fix build
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- vdccm-gcc43.patch DELETED ---




More information about the fedora-extras-commits mailing list