[syncevolution] - fix build with gcc 4.6 - disable bluetooth on s390(x)

[Dan Horák]

commit 6841894e1866c106075ce97b5d745b9adc944c67
Author: Dan Horák <dan at danny.cz>
Date:   Tue Feb 1 19:11:46 2011 +0100

    - fix build with gcc 4.6
    - disable bluetooth on s390(x)

 syncevolution-1.1.1-gcc46.patch |   22 ++++++++++++++++++++++
 syncevolution.spec              |   19 ++++++++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)
---
diff --git a/syncevolution-1.1.1-gcc46.patch b/syncevolution-1.1.1-gcc46.patch
new file mode 100644
index 0000000..6c80a7f
--- /dev/null
+++ b/syncevolution-1.1.1-gcc46.patch
@@ -0,0 +1,22 @@
+diff -up syncevolution-1.1.1/src/synthesis/src/sysync/binfileimplclient.cpp.orig syncevolution-1.1.1/src/synthesis/src/sysync/binfileimplclient.cpp
+--- syncevolution-1.1.1/src/synthesis/src/sysync/binfileimplclient.cpp.orig	2011-02-01 18:46:43.000000000 +0100
++++ syncevolution-1.1.1/src/synthesis/src/sysync/binfileimplclient.cpp	2011-02-01 18:46:56.000000000 +0100
+@@ -19,6 +19,7 @@
+ #include "binfileimplclient.h"
+ #include "binfileimplds.h"
+ #include "syserial.h"
++#include <cstddef>
+ 
+ 
+ namespace sysync {
+diff -up syncevolution-1.1.1/src/synthesis/src/sysync/binfileimplds.cpp.orig syncevolution-1.1.1/src/synthesis/src/sysync/binfileimplds.cpp
+--- syncevolution-1.1.1/src/synthesis/src/sysync/binfileimplds.cpp.orig	2011-02-01 18:47:14.000000000 +0100
++++ syncevolution-1.1.1/src/synthesis/src/sysync/binfileimplds.cpp	2011-02-01 18:47:25.000000000 +0100
+@@ -19,6 +19,7 @@
+ #include "sysync.h"
+ #include "binfileimplclient.h"
+ #include "binfileimplds.h"
++#include <cstddef>
+ 
+ #if defined(BINFILE_ALWAYS_ACTIVE) && defined(SYSYNC_SERVER)
+ 	#error "BINFILE_ALWAYS_ACTIVE is not compatible with server-enabled builds"
diff --git a/syncevolution.spec b/syncevolution.spec
index 88476f8..3dffa55 100644
--- a/syncevolution.spec
+++ b/syncevolution.spec
@@ -1,12 +1,13 @@
 Summary:       SyncML client for evolution
 Name:          syncevolution
 Version:       1.1.1
-Release:       2%{?dist}
-Epoch:         1	
+Release:       3%{?dist}
+Epoch:         1
 License:       LGPLv2+
 Group:         Applications/Productivity
 URL:           http://syncevolution.org/
 Source:        http://downloads.syncevolution.org/%{name}/sources/%{name}-%{version}.tar.gz
+Patch0:        %{name}-1.1.1-gcc46.patch
 
 BuildRequires: bluez-libs-devel
 BuildRequires: boost-devel
@@ -21,7 +22,9 @@ BuildRequires: libical-devel
 BuildRequires: libmx-devel
 BuildRequires: libnotify-devel
 BuildRequires: libsoup-devel
+%ifnarch s390 s390x
 BuildRequires: openobex-devel
+%endif
 BuildRequires: pcre-devel
 BuildRequires: python-docutils
 BuildRequires: unique-devel
@@ -82,6 +85,7 @@ Perl utils for use with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc46
 
 # use the ac macros in Makefile.am
 sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am
@@ -93,7 +97,12 @@ autoreconf -fiv
 (cd src/synthesis && mkdir m4 && autoreconf -fi)
 
 %configure --enable-libsoup --enable-dbus-service --enable-shared \
-    --with-expat=system --disable-static --enable-gui=all --enable-bluetooth
+    --with-expat=system --disable-static --enable-gui=all \
+%ifnarch s390 s390x
+    --enable-bluetooth
+%else
+    --disable-bluetooth
+%endif
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g
 	s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
@@ -174,6 +183,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-moblin.desktop
 %{_datadir}/syncevolution/xml/*.pl
 
 %changelog
+* Tue Feb  1 2011 Dan Horák <dan[at]danny.cz> 1:1.1.1-3
+- fix build with gcc 4.6
+- disable bluetooth on s390(x)
+
 * Wed Jan 12 2011 Milan Crha <mcrha at redhat.com> 1:1.1.1-2
 - Rebuild against newer evolution-data-server