[syncevolution] gdbus_static.patch: fix crasher by linking gdbus statically (#640750)

[Adam Williamson]

commit 930931c7f47c48206feb9e6defc21f058007535e
Author: Adam Williamson <awilliam at redhat.com>
Date:   Thu Mar 3 13:47:15 2011 -0800

    gdbus_static.patch: fix crasher by linking gdbus statically (#640750)

 syncevolution-1.1.1-gdbus_static.patch |   13 +++++++++++++
 syncevolution.spec                     |   14 ++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/syncevolution-1.1.1-gdbus_static.patch b/syncevolution-1.1.1-gdbus_static.patch
new file mode 100644
index 0000000..ace4792
--- /dev/null
+++ b/syncevolution-1.1.1-gdbus_static.patch
@@ -0,0 +1,13 @@
+--- syncevolution-1.1.1/src/gdbus/Makefile.am	2010-12-26 05:40:50.000000000 -0800
++++ syncevolution-1.1.1/src/gdbus/Makefile.am.new	2011-03-03 13:23:53.735577735 -0800
+@@ -1,10 +1,6 @@
+ # include_HEADERS = gdbus.h
+ 
+-if ENABLE_MODULES
+-pkglib_LTLIBRARIES = libgdbus.la
+-else
+ noinst_LTLIBRARIES = libgdbus.la
+-endif
+ 
+ libgdbus_la_SOURCES = debug.h debug.c mainloop.c object.c watch.c \
+     gdbus.h gdbus-cxx-bridge.h gdbus-cxx.h
diff --git a/syncevolution.spec b/syncevolution.spec
index 6d6b757..fad6702 100644
--- a/syncevolution.spec
+++ b/syncevolution.spec
@@ -1,7 +1,7 @@
 Summary:       SyncML client for evolution
 Name:          syncevolution
 Version:       1.1.1
-Release:       5%{?dist}
+Release:       6%{?dist}
 Epoch:         1
 License:       LGPLv2+
 Group:         Applications/Productivity
@@ -10,6 +10,11 @@ Source:        http://downloads.syncevolution.org/%{name}/sources/%{name}-%{vers
 Patch0:        %{name}-1.1.1-gcc46.patch
 # https://bugs.meego.com/show_bug.cgi?id=13201
 Patch1:        %{name}-1.1.1-size_t.patch
+# link statically against internal libgdbus to avoid crashing
+# basically re-apply upstream ec7eb74366a9d1b2d5390c75a8ab2716d579e0cc
+# which was reverted (prematurely) - AdamW 2011/03
+# https://bugzilla.redhat.com/show_bug.cgi?id=640750
+Patch2:		syncevolution-1.1.1-gdbus_static.patch
 
 BuildRequires: bluez-libs-devel
 BuildRequires: boost-devel
@@ -36,7 +41,6 @@ BuildRequires: intltool
 BuildRequires: gettext
 BuildRequires: libtool
 
-Requires: libgdbus
 Requires: python-twisted-web
 
 %description
@@ -89,6 +93,7 @@ Perl utils for use with %{name}.
 %setup -q
 %patch0 -p1 -b .gcc46
 %patch1 -p1 -b .size_t
+%patch2 -p1 -b .gdbus
 
 # use the ac macros in Makefile.am
 sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am
@@ -157,7 +162,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-moblin.desktop
 %doc COPYING LICENSE.LGPL-21 LICENSE.txt
 %{_libdir}/*so.0*
 %dir %{_libdir}/syncevolution
-%{_libdir}/syncevolution/*so.0*
 %{_libdir}/syncevolution/backends
 
 %files devel
@@ -167,7 +171,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-moblin.desktop
 %{_includedir}/synthesis
 %{_libdir}/pkgconfig/s*.pc
 %{_libdir}/*so
-%{_libdir}/syncevolution/libgdbus.so
 
 %files gtk
 %defattr(-,root,root,-)
@@ -186,6 +189,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-moblin.desktop
 %{_datadir}/syncevolution/xml/*.pl
 
 %changelog
+* Thu Mar 3 2011 Adam Williamson <awilliam at redhat.com> - 1:1.1.1-6
+- build the private libgdbus statically again for now to avoid crasher
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild