[openchange] New snapshot that avoid bison issues. Also add patch that fix build (previously erroneously preappli

[Simo Sorce]

commit d8f60299dc62706901e3a0dcd270989f9165dd10
Author: Simo Sorce <ssorce at redhat.com>
Date:   Fri Mar 25 17:35:13 2011 -0400

    New snapshot that avoid bison issues.
    Also add patch that fix build (previously erroneously preapplied in the
    snapshot tarball)

 .gitignore                                      |    1 +
 openchange-0.10.9-TF16S2-fix-fedora-build.patch |   17 +++++++++++++++++
 openchange.spec                                 |   13 +++++++++++--
 sources                                         |    2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dbd4388..790fb21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 openchange-0.9-COCHRANE.tar.gz
 /openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1.tar.gz
+/openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT2.tar.gz
diff --git a/openchange-0.10.9-TF16S2-fix-fedora-build.patch b/openchange-0.10.9-TF16S2-fix-fedora-build.patch
new file mode 100644
index 0000000..9133fcc
--- /dev/null
+++ b/openchange-0.10.9-TF16S2-fix-fedora-build.patch
@@ -0,0 +1,17 @@
+Index: config.mk.in
+===================================================================
+--- config.mk.in	(revision 2750)
++++ config.mk.in	(working copy)
+@@ -47,10 +47,10 @@
+ PACKAGE_VERSION=@PACKAGE_VERSION@
+ 
+ SAMBA_CFLAGS=@SAMBA_CFLAGS@
+-SAMBA_LIBS=@SAMBA_LIBS@
++# SAMBA_LIBS=@SAMBA_LIBS@
+ # If you have problems linking to samba-util-common (Fedora 13/14), try this instead.
+ # You'll also need to fix your LD_LIBRARY_PATH
+-# SAMBA_LIBS=@SAMBA_LIBS@  -L at sambaprefix@/lib/samba -lsamba-util-common
++SAMBA_LIBS=@SAMBA_LIBS@  -L at libdir@/samba -lsamba-util-common
+ 
+ LDB_CFLAGS=@LDB_CFLAGS@
+ LDB_LIBS=@LDB_LIBS@
diff --git a/openchange.spec b/openchange.spec
index a7adfb9..cb5f773 100644
--- a/openchange.spec
+++ b/openchange.spec
@@ -2,7 +2,7 @@
 
 %global samba4_version 4.0.0-34.alpha15GITa6a722b
 %global talloc_version 2.0.5
-%global nickname TRANSPORTER-F16-SNAPSHOT1
+%global nickname TRANSPORTER-F16-SNAPSHOT2
 
 %global build_python_package 0
 %global build_server_package 0
@@ -13,7 +13,7 @@
 
 Name: openchange
 Version: 0.10.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
@@ -49,6 +49,9 @@ Patch0: libmapi-0.8.2-libmapi-conflict.patch
 # RH bug #552984
 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
+
 %description
 OpenChange provides libraries to access Microsoft Exchange servers
 using native protocols.
@@ -106,6 +109,7 @@ This package provides the server elements for OpenChange.
 %setup -q -n %{name}-%{version}-%{nickname}
 %patch0 -p1 -b .libmapi-conflict
 %patch1 -p1 -b .generate-xml-doc
+%patch2 -p0 -b .fix-build
 
 %build
 %configure
@@ -236,6 +240,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Mar 25 2011 Simo Sorce <ssorce at redhat.com> - 0.10.9-2
+- New snapshot that avoid bison issues.
+- Also add patch that fix build (previously erroneously preapplied in the
+  snapshot tarball)
+
 * Fri Mar 25 2011 Simo Sorce <ssorce at redhat.com> - 0.10.9-1
 - Upgrade to a 0.11 development snapshot.
 - Required by the new samba4 packages.
diff --git a/sources b/sources
index 0a4b19a..1baea4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dbf01916a39dbbe98e0b96ccabbf2ea2  openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1.tar.gz
+3eca73a8c54cbbb018aba6a3f1c88e35  openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT2.tar.gz