From 98010a4171f07c32c784c7710e28465f7b8e2ed2 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Fri, 21 Dec 2007 09:24:13 +0000 Subject: [PATCH 01/15] - version upgrade (upstream security fix) --- .cvsignore | 2 +- sources | 2 +- vdccm.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index dbc5f4d..b17bf44 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -synce-vdccm-0.10.0.tar.gz +vdccm-0.10.1.tar.gz diff --git a/sources b/sources index e40e578..e3b3566 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f6fcb49297cf80a028bfe75a8e1bdc4d synce-vdccm-0.10.0.tar.gz +43bca4c2fdb658f99b07549fa03832e0 vdccm-0.10.1.tar.gz diff --git a/vdccm.spec b/vdccm.spec index 10bc45e..b94e87b 100644 --- a/vdccm.spec +++ b/vdccm.spec @@ -1,15 +1,15 @@ Name: vdccm -Version: 0.10.0 +Version: 0.10.1 Release: 1%{?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/synce-vdccm-%{version}.tar.gz +Source0: http://download.sf.net/synce/vdccm-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libsynce-devel +BuildRequires: libsynce-devel >= 0.10.0 BuildRequires: libtool Requires: synce-serial @@ -66,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %changelog +* Fri Dec 21 2007 Andreas Bierfert +- 0.10.1-1 +- version upgrade + * Wed May 09 2007 Aurelien Bompard 0.10.0-1 - version 0.10.0 From 1ef46a40a588cf87dee30c1b87f398ec91739acc Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 18 Feb 2008 20:53:17 +0000 Subject: [PATCH 02/15] - Autorebuild for GCC 4.3 --- vdccm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdccm.spec b/vdccm.spec index b94e87b..ffcb424 100644 --- a/vdccm.spec +++ b/vdccm.spec @@ -1,6 +1,6 @@ Name: vdccm Version: 0.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Serial connection daemon for Pocket PC devices Group: Applications/Communications @@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %changelog +* Mon Feb 18 2008 Fedora Release Engineering - 0.10.1-2 +- Autorebuild for GCC 4.3 + * Fri Dec 21 2007 Andreas Bierfert - 0.10.1-1 - version upgrade From 396fe51dabbe925cb3cb4c7da23336988dd5265b Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Fri, 22 Feb 2008 14:33:53 +0000 Subject: [PATCH 03/15] - fix gcc43 build (#433998) --- vdccm-gcc43.patch | 11 +++++++++++ vdccm.spec | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 vdccm-gcc43.patch diff --git a/vdccm-gcc43.patch b/vdccm-gcc43.patch new file mode 100644 index 0000000..123c1ba --- /dev/null +++ b/vdccm-gcc43.patch @@ -0,0 +1,11 @@ +--- lib/tcpsocket.cpp.orig 2008-02-22 15:26:59.000000000 +0100 ++++ lib/tcpsocket.cpp 2008-02-22 15:27:42.000000000 +0100 +@@ -23,7 +23,7 @@ + #include "tcpsocket.h" + #include + #include +- ++#include + + using namespace std; + diff --git a/vdccm.spec b/vdccm.spec index ffcb424..ec81f72 100644 --- a/vdccm.spec +++ b/vdccm.spec @@ -1,12 +1,13 @@ Name: vdccm Version: 0.10.1 -Release: 2%{?dist} +Release: 3%{?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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsynce-devel >= 0.10.0 @@ -14,7 +15,6 @@ BuildRequires: libtool Requires: synce-serial - %description Vdccm is a daemon running as the user on the desktop machine, which the Pocket PC connects to. @@ -33,6 +33,7 @@ This package contains the header files and link libraries for vdccm %prep %setup -q sed -i -e "/chown root/d" src/Makefile.in +%patch0 %build %configure --disable-static @@ -66,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %changelog +* Fri Feb 22 2008 Andreas Bierfert +- 0.10.1-3 +- fix gcc43 build (#433998) + * Mon Feb 18 2008 Fedora Release Engineering - 0.10.1-2 - Autorebuild for GCC 4.3 From 7f38d7add09cb7d9e3a5bd611ab16f86bacfeafb Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Fri, 22 Feb 2008 14:47:50 +0000 Subject: [PATCH 04/15] - enhance patch --- vdccm-gcc43.patch | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/vdccm-gcc43.patch b/vdccm-gcc43.patch index 123c1ba..d9e1dab 100644 --- a/vdccm-gcc43.patch +++ b/vdccm-gcc43.patch @@ -9,3 +9,43 @@ using namespace std; +--- localconnectedsocket.cpp.orig 2008-02-22 15:44:58.000000000 +0100 ++++ localconnectedsocket.cpp 2008-02-22 15:45:50.000000000 +0100 +@@ -22,6 +22,7 @@ + ***************************************************************************/ + #include "localconnectedsocket.h" + #include ++#include + + using namespace std; + +--- tcpclientsocket.cpp.orig 2008-02-22 15:45:13.000000000 +0100 ++++ tcpclientsocket.cpp 2008-02-22 15:45:58.000000000 +0100 +@@ -22,6 +22,7 @@ + ***************************************************************************/ + #include "tcpclientsocket.h" + #include ++#include + + using namespace std; + +--- tcpconnectedsocket.cpp.orig 2008-02-22 15:44:19.000000000 +0100 ++++ tcpconnectedsocket.cpp 2008-02-22 15:44:34.000000000 +0100 +@@ -23,6 +23,7 @@ + #include "tcpconnectedsocket.h" + #include + #include ++#include + + // Ugly hack - the header could not be included + // due to conflicts with other systemheader +--- udpsocket.cpp.orig 2008-02-22 15:45:24.000000000 +0100 ++++ udpsocket.cpp 2008-02-22 15:46:04.000000000 +0100 +@@ -11,6 +11,7 @@ + // + #include "udpsocket.h" + #include ++#include + + using namespace std; + From 098fd7e1a14c11a76f49946fa52cc87dd95757bc Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Fri, 22 Feb 2008 14:58:33 +0000 Subject: [PATCH 05/15] - fix path --- vdccm-gcc43.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/vdccm-gcc43.patch b/vdccm-gcc43.patch index d9e1dab..4c905b8 100644 --- a/vdccm-gcc43.patch +++ b/vdccm-gcc43.patch @@ -9,8 +9,8 @@ using namespace std; ---- localconnectedsocket.cpp.orig 2008-02-22 15:44:58.000000000 +0100 -+++ localconnectedsocket.cpp 2008-02-22 15:45:50.000000000 +0100 +--- lib/localconnectedsocket.cpp.orig 2008-02-22 15:44:58.000000000 +0100 ++++ lib/localconnectedsocket.cpp 2008-02-22 15:45:50.000000000 +0100 @@ -22,6 +22,7 @@ ***************************************************************************/ #include "localconnectedsocket.h" @@ -19,8 +19,8 @@ using namespace std; ---- tcpclientsocket.cpp.orig 2008-02-22 15:45:13.000000000 +0100 -+++ tcpclientsocket.cpp 2008-02-22 15:45:58.000000000 +0100 +--- lib/tcpclientsocket.cpp.orig 2008-02-22 15:45:13.000000000 +0100 ++++ lib/tcpclientsocket.cpp 2008-02-22 15:45:58.000000000 +0100 @@ -22,6 +22,7 @@ ***************************************************************************/ #include "tcpclientsocket.h" @@ -29,8 +29,8 @@ using namespace std; ---- tcpconnectedsocket.cpp.orig 2008-02-22 15:44:19.000000000 +0100 -+++ tcpconnectedsocket.cpp 2008-02-22 15:44:34.000000000 +0100 +--- lib/tcpconnectedsocket.cpp.orig 2008-02-22 15:44:19.000000000 +0100 ++++ lib/tcpconnectedsocket.cpp 2008-02-22 15:44:34.000000000 +0100 @@ -23,6 +23,7 @@ #include "tcpconnectedsocket.h" #include @@ -39,8 +39,8 @@ // Ugly hack - the header could not be included // due to conflicts with other systemheader ---- udpsocket.cpp.orig 2008-02-22 15:45:24.000000000 +0100 -+++ udpsocket.cpp 2008-02-22 15:46:04.000000000 +0100 +--- lib/udpsocket.cpp.orig 2008-02-22 15:45:24.000000000 +0100 ++++ lib/udpsocket.cpp 2008-02-22 15:46:04.000000000 +0100 @@ -11,6 +11,7 @@ // #include "udpsocket.h" From 0590d6b253aa31209cfea6f8e914f82ac93eaa31 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Fri, 22 Feb 2008 15:15:28 +0000 Subject: [PATCH 06/15] - more fixes --- vdccm-gcc43.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/vdccm-gcc43.patch b/vdccm-gcc43.patch index 4c905b8..2ab7c6d 100644 --- a/vdccm-gcc43.patch +++ b/vdccm-gcc43.patch @@ -49,3 +49,14 @@ using namespace std; +--- src/rapiclient.h.orig 2008-02-22 16:13:42.000000000 +0100 ++++ src/rapiclient.h 2008-02-22 16:14:16.000000000 +0100 +@@ -14,6 +14,8 @@ + + #include + ++#include ++ + /** + @author Volker Christian + */ From 483a745b7f05d1d94cf16788d4b37065072bfa8f Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Fri, 22 Feb 2008 15:28:22 +0000 Subject: [PATCH 07/15] - more fixes --- vdccm-gcc43.patch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/vdccm-gcc43.patch b/vdccm-gcc43.patch index 2ab7c6d..a2ef732 100644 --- a/vdccm-gcc43.patch +++ b/vdccm-gcc43.patch @@ -60,3 +60,34 @@ /** @author Volker Christian */ +--- src/rapiclient.cpp.orig 2008-02-22 16:23:05.000000000 +0100 ++++ src/rapiclient.cpp 2008-02-22 16:23:21.000000000 +0100 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + + using namespace std; +--- src/rapiconnection.cpp.orig 2008-02-22 16:25:36.000000000 +0100 ++++ src/rapiconnection.cpp 2008-02-22 16:26:00.000000000 +0100 +@@ -22,6 +22,7 @@ + #include "synce_log.h" + #include + #include ++#include + + using namespace std; + +--- src/rapiproxyconnection.cpp.orig 2008-02-22 16:27:02.000000000 +0100 ++++ src/rapiproxyconnection.cpp 2008-02-22 16:27:18.000000000 +0100 +@@ -19,6 +19,8 @@ + + #include + ++#include ++ + RapiProxyConnection::RapiProxyConnection(RapiConnection *rapiConnection, RapiProxy *rapiProxy, + RapiProvisioningClient *rapiProvisioningClient) + : rapiConnection(rapiConnection), From ae9e25f02769a3058ff97270312f3c4f8545430e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 23:53:50 +0000 Subject: [PATCH 08/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- vdccm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdccm.spec b/vdccm.spec index ec81f72..ce3995f 100644 --- a/vdccm.spec +++ b/vdccm.spec @@ -1,6 +1,6 @@ Name: vdccm Version: 0.10.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Serial connection daemon for Pocket PC devices Group: Applications/Communications @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.10.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Feb 22 2008 Andreas Bierfert - 0.10.1-3 - fix gcc43 build (#433998) From d2d9f809adc6d9f9443acab2c13ee19a5df3b717 Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Fri, 6 Mar 2009 13:20:29 +0000 Subject: [PATCH 09/15] fix build --- vdccm-gcc43.patch | 93 ---------------------------------- vdccm-includes.patch | 116 +++++++++++++++++++++++++++++++++++++++++++ vdccm.spec | 9 ++-- 3 files changed, 122 insertions(+), 96 deletions(-) delete mode 100644 vdccm-gcc43.patch create mode 100644 vdccm-includes.patch diff --git a/vdccm-gcc43.patch b/vdccm-gcc43.patch deleted file mode 100644 index a2ef732..0000000 --- a/vdccm-gcc43.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- lib/tcpsocket.cpp.orig 2008-02-22 15:26:59.000000000 +0100 -+++ lib/tcpsocket.cpp 2008-02-22 15:27:42.000000000 +0100 -@@ -23,7 +23,7 @@ - #include "tcpsocket.h" - #include - #include -- -+#include - - using namespace std; - ---- lib/localconnectedsocket.cpp.orig 2008-02-22 15:44:58.000000000 +0100 -+++ lib/localconnectedsocket.cpp 2008-02-22 15:45:50.000000000 +0100 -@@ -22,6 +22,7 @@ - ***************************************************************************/ - #include "localconnectedsocket.h" - #include -+#include - - using namespace std; - ---- lib/tcpclientsocket.cpp.orig 2008-02-22 15:45:13.000000000 +0100 -+++ lib/tcpclientsocket.cpp 2008-02-22 15:45:58.000000000 +0100 -@@ -22,6 +22,7 @@ - ***************************************************************************/ - #include "tcpclientsocket.h" - #include -+#include - - using namespace std; - ---- lib/tcpconnectedsocket.cpp.orig 2008-02-22 15:44:19.000000000 +0100 -+++ lib/tcpconnectedsocket.cpp 2008-02-22 15:44:34.000000000 +0100 -@@ -23,6 +23,7 @@ - #include "tcpconnectedsocket.h" - #include - #include -+#include - - // Ugly hack - the header could not be included - // due to conflicts with other systemheader ---- lib/udpsocket.cpp.orig 2008-02-22 15:45:24.000000000 +0100 -+++ lib/udpsocket.cpp 2008-02-22 15:46:04.000000000 +0100 -@@ -11,6 +11,7 @@ - // - #include "udpsocket.h" - #include -+#include - - using namespace std; - ---- src/rapiclient.h.orig 2008-02-22 16:13:42.000000000 +0100 -+++ src/rapiclient.h 2008-02-22 16:14:16.000000000 +0100 -@@ -14,6 +14,8 @@ - - #include - -+#include -+ - /** - @author Volker Christian - */ ---- src/rapiclient.cpp.orig 2008-02-22 16:23:05.000000000 +0100 -+++ src/rapiclient.cpp 2008-02-22 16:23:21.000000000 +0100 -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - - using namespace std; ---- src/rapiconnection.cpp.orig 2008-02-22 16:25:36.000000000 +0100 -+++ src/rapiconnection.cpp 2008-02-22 16:26:00.000000000 +0100 -@@ -22,6 +22,7 @@ - #include "synce_log.h" - #include - #include -+#include - - using namespace std; - ---- src/rapiproxyconnection.cpp.orig 2008-02-22 16:27:02.000000000 +0100 -+++ src/rapiproxyconnection.cpp 2008-02-22 16:27:18.000000000 +0100 -@@ -19,6 +19,8 @@ - - #include - -+#include -+ - RapiProxyConnection::RapiProxyConnection(RapiConnection *rapiConnection, RapiProxy *rapiProxy, - RapiProvisioningClient *rapiProvisioningClient) - : rapiConnection(rapiConnection), diff --git a/vdccm-includes.patch b/vdccm-includes.patch new file mode 100644 index 0000000..a266580 --- /dev/null +++ b/vdccm-includes.patch @@ -0,0 +1,116 @@ +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 ++#include + + 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 ++#include + + 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 + #include ++#include + + // Ugly hack - the header 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 + #include +- ++#include + + 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 ++#include + + 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 ++#include + #include + + /** +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 + #include + #include ++#include + + + 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 + ++#include ++ + /** + @author Volker Christian + */ +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 + #include ++#include ++#include + + 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 + ++#include ++ + RapiProxyConnection::RapiProxyConnection(RapiConnection *rapiConnection, RapiProxy *rapiProxy, + RapiProvisioningClient *rapiProvisioningClient) + : rapiConnection(rapiConnection), diff --git a/vdccm.spec b/vdccm.spec index ce3995f..20fe32a 100644 --- a/vdccm.spec +++ b/vdccm.spec @@ -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 @@ This package contains the header files and link libraries for vdccm %prep %setup -q sed -i -e "/chown root/d" src/Makefile.in -%patch0 +%patch0 -p1 %build %configure --disable-static @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %changelog +* Fri Mar 05 2009 Caolán McNamara - 0.10.1-5 +- fix build + * Wed Feb 25 2009 Fedora Release Engineering - 0.10.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 199a6713a0b9e430c02f457ea53e7cd2cfb65497 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 06:45:44 +0000 Subject: [PATCH 10/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- vdccm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdccm.spec b/vdccm.spec index 20fe32a..717398e 100644 --- a/vdccm.spec +++ b/vdccm.spec @@ -1,6 +1,6 @@ Name: vdccm Version: 0.10.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Serial connection daemon for Pocket PC devices Group: Applications/Communications @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 0.10.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Mar 05 2009 Caolán McNamara - 0.10.1-5 - fix build From 2ad56ab8c40a9fe264e2754aa744575c5e5b4d53 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:19 +0000 Subject: [PATCH 11/15] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f029cb2..4369c16 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vdccm -# $Id$ +# $Id: Makefile,v 1.1 2007/04/29 22:08:12 wtogami Exp $ NAME := vdccm SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 1fcb8d07257f692e9efad53a05e72fdd212028e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:54:50 +0000 Subject: [PATCH 12/15] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4369c16..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vdccm -# $Id: Makefile,v 1.1 2007/04/29 22:08:12 wtogami Exp $ -NAME := vdccm -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From c857c6e21b6c878b5c3b2da16dd0b53ce8cc827d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:03:25 -0600 Subject: [PATCH 13/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- vdccm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdccm.spec b/vdccm.spec index 717398e..6d30de9 100644 --- a/vdccm.spec +++ b/vdccm.spec @@ -1,6 +1,6 @@ Name: vdccm Version: 0.10.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Serial connection daemon for Pocket PC devices Group: Applications/Communications @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.10.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Jul 26 2009 Fedora Release Engineering - 0.10.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From f18be3ab0d613a98479b821bb8d0ff5d92d973fb Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Tue, 23 Aug 2011 18:07:16 +0200 Subject: [PATCH 14/15] Package is retired --- .gitignore | 1 - dead.package | 1 + sources | 1 - vdccm-includes.patch | 116 ------------------------------------------- vdccm.spec | 97 ------------------------------------ 5 files changed, 1 insertion(+), 215 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 vdccm-includes.patch delete mode 100644 vdccm.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b17bf44..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -vdccm-0.10.1.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..f2396d2 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Package is retired \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index e3b3566..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -43bca4c2fdb658f99b07549fa03832e0 vdccm-0.10.1.tar.gz diff --git a/vdccm-includes.patch b/vdccm-includes.patch deleted file mode 100644 index a266580..0000000 --- a/vdccm-includes.patch +++ /dev/null @@ -1,116 +0,0 @@ -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 -+#include - - 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 -+#include - - 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 - #include -+#include - - // Ugly hack - the header 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 - #include -- -+#include - - 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 -+#include - - 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 -+#include - #include - - /** -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 - #include - #include -+#include - - - 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 - -+#include -+ - /** - @author Volker Christian - */ -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 - #include -+#include -+#include - - 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 - -+#include -+ - RapiProxyConnection::RapiProxyConnection(RapiConnection *rapiConnection, RapiProxy *rapiProxy, - RapiProvisioningClient *rapiProvisioningClient) - : rapiConnection(rapiConnection), diff --git a/vdccm.spec b/vdccm.spec deleted file mode 100644 index 6d30de9..0000000 --- a/vdccm.spec +++ /dev/null @@ -1,97 +0,0 @@ -Name: vdccm -Version: 0.10.1 -Release: 7%{?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}-includes.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: libsynce-devel >= 0.10.0 -BuildRequires: libtool - -Requires: synce-serial - -%description -Vdccm is a daemon running as the user on the desktop machine, which -the Pocket PC connects to. -This vdccm is a replacement of the original dccm and the vdccm comming -with SynCE-KDE. - -%package devel -Summary: Development libraries and header files for vdccm -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -This package contains the header files and link libraries for vdccm - - -%prep -%setup -q -sed -i -e "/chown root/d" src/Makefile.in -%patch0 -p1 - -%build -%configure --disable-static -make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -rm -f $RPM_BUILD_ROOT%{_libdir}/*.{la,a} - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING NEWS README TODO -%attr(4755,root,root) %{_bindir}/vdccm -%{_bindir}/triggerconnection -%{_mandir}/man1/* - -%files devel -%defattr(-,root,root,-) - -%changelog -* Mon Feb 07 2011 Fedora Release Engineering - 0.10.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Jul 26 2009 Fedora Release Engineering - 0.10.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Mar 05 2009 Caolán McNamara - 0.10.1-5 -- fix build - -* Wed Feb 25 2009 Fedora Release Engineering - 0.10.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Feb 22 2008 Andreas Bierfert -- 0.10.1-3 -- fix gcc43 build (#433998) - -* Mon Feb 18 2008 Fedora Release Engineering - 0.10.1-2 -- Autorebuild for GCC 4.3 - -* Fri Dec 21 2007 Andreas Bierfert -- 0.10.1-1 -- version upgrade - -* Wed May 09 2007 Aurelien Bompard 0.10.0-1 -- version 0.10.0 - -* Sat Mar 03 2007 Aurelien Bompard 0.9.3-1 -- split off the synce package From 6cbd906b3729671028dd65e593bb744809e50e2d Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Tue, 23 Aug 2011 18:07:36 +0200 Subject: [PATCH 15/15] Package is retired and obsoleted by synce-connector --- dead.package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dead.package b/dead.package index f2396d2..5b11471 100644 --- a/dead.package +++ b/dead.package @@ -1 +1 @@ -Package is retired \ No newline at end of file +Package is retired and obsoleted by synce-connector