[openchange] Add samba-util-common-workaround.patch

[Matthew Barnes]

commit 09df09710619b5a2a8b1a75e0522578adb94e5bf
Author: Matthew Barnes <mbarnes at redhat.com>
Date:   Wed Apr 6 14:37:17 2011 -0400

    Add samba-util-common-workaround.patch

 openchange.spec                    |   10 +++++++++-
 samba-util-common-workaround.patch |   12 ++++++++++++
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/openchange.spec b/openchange.spec
index e20f7d4..50e64fc 100644
--- a/openchange.spec
+++ b/openchange.spec
@@ -13,7 +13,7 @@
 
 Name: openchange
 Version: 0.10.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
@@ -52,6 +52,9 @@ Patch1: openchange-0.9-generate-xml-doc.patch
 # Needed to workaround a samba4 library chain bug
 Patch2: openchange-0.10.9-TF16S2-fix-fedora-build.patch
 
+# Extra linker flags for samba/libsamba-util-common.so
+Patch3: samba-util-common-workaround.patch
+
 %description
 OpenChange provides libraries to access Microsoft Exchange servers
 using native protocols.
@@ -110,6 +113,7 @@ This package provides the server elements for OpenChange.
 %patch0 -p1 -b .libmapi-conflict
 %patch1 -p1 -b .generate-xml-doc
 %patch2 -p0 -b .fix-build
+%patch3 -p1 -b .samba-util-common-workaround
 
 %build
 %configure
@@ -240,6 +244,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Apr 6 2011 Matthew Barnes <mbarnes at redhat.com> - 0.10.9-4
+- OpenChange relies on a private Samba 4 library (libsamba-util-common).
+  Add extra linker flags to libmapi.pc to compensate.
+
 * Wed Apr 6 2011 Matthew Barnes <mbarnes at redhat.com> - 0.10.9-3
 - Move libmapiproxy.so, libmapistore.so and mapistore backend libraries
   to the main package so the client subpackage is installable.
diff --git a/samba-util-common-workaround.patch b/samba-util-common-workaround.patch
new file mode 100644
index 0000000..699c021
--- /dev/null
+++ b/samba-util-common-workaround.patch
@@ -0,0 +1,12 @@
+diff -up openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT2/libmapi.pc.in.samba-util-common-workaround openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT2/libmapi.pc.in
+--- openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT2/libmapi.pc.in.samba-util-common-workaround	2011-04-06 14:18:39.425467579 -0400
++++ openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT2/libmapi.pc.in	2011-04-06 14:19:06.585470454 -0400
+@@ -8,7 +8,7 @@ datadir=/usr/share
+ Name: MAPI
+ Description: MAPI Protocol Implementation
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lmapi-openchange
++Libs: -L${libdir} -L${libdir}/samba -lmapi-openchange -lsamba-util-common
+ Libs.private: @LIBS@
+ Cflags: -I${includedir}
+ Requires: talloc dcerpc ndr tevent