[libopensync-plugin-synce] 1:0.22.1-5 fix ftbfs (rhbz#715918)

[Andreas Bierfert]

commit 0c102b187b1d5729983d06de43ba52c3a102384b
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Fri Jul 1 19:56:31 2011 +0200

    1:0.22.1-5
    fix ftbfs (rhbz#715918)

 libopensync-plugin-synce-gcc46.patch |   45 ++++++++++++++++++++++++++++++++++
 libopensync-plugin-synce.spec        |   10 +++++++-
 2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/libopensync-plugin-synce-gcc46.patch b/libopensync-plugin-synce-gcc46.patch
new file mode 100644
index 0000000..f306bb9
--- /dev/null
+++ b/libopensync-plugin-synce-gcc46.patch
@@ -0,0 +1,45 @@
+diff -up libopensync-plugin-synce-rra-0.22.1/src/synce_file.c.orig libopensync-plugin-synce-rra-0.22.1/src/synce_file.c
+--- libopensync-plugin-synce-rra-0.22.1/src/synce_file.c.orig	2011-07-01 19:41:36.000000000 +0200
++++ libopensync-plugin-synce-rra-0.22.1/src/synce_file.c	2011-07-01 19:43:43.000000000 +0200
+@@ -220,7 +220,7 @@ synce_file_commit(OSyncContext *ctx, OSy
+ 	fileFormat	*ff;
+ 	WCHAR		*wfn;
+ 	DWORD		wr, e, opt;
+-        char		*p, *s, *fn, *lfn, *str;
++        char		*p, *fn, *lfn, *str;
+ 	OSyncChangeType	ct;
+ 
+ 	osync_debug("SYNCE-SYNC", 4, "start: %s", __func__);	
+@@ -263,7 +263,7 @@ synce_file_commit(OSyncContext *ctx, OSy
+ 		case CHANGE_ADDED:
+ 		case CHANGE_MODIFIED:
+ 			/* First check whether the directory tree exists. */
+-			for (s=p=lfn+1; *p; p++) {
++			for (p=lfn+1; *p; p++) {
+ 				if (*p == '\\') {
+ 					WCHAR	*w;
+ 					DWORD	cnt;
+@@ -302,7 +302,6 @@ synce_file_commit(OSyncContext *ctx, OSy
+ 					}
+ 					/* Restore string, forward loop */
+ 					*p = '\\';
+-					s = p+1;
+ 					wstr_free_string(w);
+ 					CeRapiFreeBuffer(find_data);
+ 				}
+@@ -578,7 +577,6 @@ GList*
+ synce_list_directories(SyncePluginPtr *env, const char *basedir,
+                        OSyncError **error)
+ {
+-	HRESULT hr;
+ 	GList	*ret = NULL;
+ #if 0
+ 	WCHAR	path[MAX_PATH];
+@@ -586,7 +584,6 @@ synce_list_directories(SyncePluginPtr *e
+ 	int	r;
+ #endif
+ 
+-	hr = CeRapiInit();
+ #if 0
+ 	int	i;
+ 
diff --git a/libopensync-plugin-synce.spec b/libopensync-plugin-synce.spec
index 1f0b58e..aded5f3 100644
--- a/libopensync-plugin-synce.spec
+++ b/libopensync-plugin-synce.spec
@@ -1,13 +1,14 @@
 Name:           libopensync-plugin-synce
 Epoch:          1
 Version:        0.22.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Synce plugin for libopensync to sync WM2003 devices
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.synce.org
 Source0:        http://sourceforge.net/projects/synce/files/SynCE/libopensync-plugin-synce-rra-0.22.1.tar.gz
+Patch0:	        libopensync-plugin-synce-gcc46.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel = 1:0.22
@@ -26,6 +27,9 @@ For WM5+ devices use libopensync-plugin-synce-wm5.
 %prep
 %setup -q -n %{name}-rra-%{version}
 
+%patch0 -p1 -b .gcc46
+
+
 %build
 %configure --disable-static
 make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
@@ -47,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/opensync/defaults/synce-plugin
 
 %changelog
+* Fri Jul 01 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1:0.22.1-5
+- fix ftbfs (rhbz#715918)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.22.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild