[openchange] Add patch to use system's popt.h

[Milan Crha]

commit d553ea3dac91bfe5f21f377b0cde4e5da8c43b66
Author: Milan Crha <mcrha at redhat.com>
Date:   Fri Jun 1 09:37:00 2012 +0200

    Add patch to use system's popt.h

 openchange-1.0-popt.patch |  120 +++++++++++++++++++++++++++++++++++++++++++++
 openchange.spec           |    9 +++-
 2 files changed, 128 insertions(+), 1 deletions(-)
---
diff --git a/openchange-1.0-popt.patch b/openchange-1.0-popt.patch
new file mode 100644
index 0000000..b9fc7b9
--- /dev/null
+++ b/openchange-1.0-popt.patch
@@ -0,0 +1,120 @@
+diff -up openchange-1.0-BORG/doc/examples/multiple_notif.c.popt openchange-1.0-BORG/doc/examples/multiple_notif.c
+--- openchange-1.0-BORG/doc/examples/multiple_notif.c.popt	2012-06-01 09:15:48.638999377 +0200
++++ openchange-1.0-BORG/doc/examples/multiple_notif.c	2012-06-01 09:15:57.488000012 +0200
+@@ -39,7 +39,7 @@
+ 
+ #include <libmapi/libmapi.h>
+ #include <pthread.h> 
+-#include <samba/popt.h>
++#include <popt.h>
+ 
+ #define	DEFAULT_PROFDB	"%s/.openchange/profiles.ldb"
+ 
+diff -up openchange-1.0-BORG/mapiproxy/libmapistore/tests/mapistore_test.c.popt openchange-1.0-BORG/mapiproxy/libmapistore/tests/mapistore_test.c
+--- openchange-1.0-BORG/mapiproxy/libmapistore/tests/mapistore_test.c.popt	2012-06-01 09:14:53.149999984 +0200
++++ openchange-1.0-BORG/mapiproxy/libmapistore/tests/mapistore_test.c	2012-06-01 09:14:57.877000291 +0200
+@@ -23,7 +23,7 @@
+ #include "mapiproxy/libmapistore/mapistore_errors.h"
+ #include <talloc.h>
+ #include <core/ntstatus.h>
+-#include <samba/popt.h>
++#include <popt.h>
+ #include <param.h>
+ #include <util/debug.h>
+ 
+diff -up openchange-1.0-BORG/testprogs/check_fasttransfer.c.popt openchange-1.0-BORG/testprogs/check_fasttransfer.c
+--- openchange-1.0-BORG/testprogs/check_fasttransfer.c.popt	2012-06-01 09:15:31.326999950 +0200
++++ openchange-1.0-BORG/testprogs/check_fasttransfer.c	2012-06-01 09:15:53.320003138 +0200
+@@ -23,7 +23,7 @@
+ #include "mapiproxy/libmapistore/mapistore.h"
+ #include "mapiproxy/libmapistore/mapistore_errors.h"
+ 
+-#include <samba/popt.h>
++#include <popt.h>
+ #include <ldb.h>
+ #include <talloc.h>
+ #include <inttypes.h>
+diff -up openchange-1.0-BORG/testprogs/test_asyncnotif.c.popt openchange-1.0-BORG/testprogs/test_asyncnotif.c
+--- openchange-1.0-BORG/testprogs/test_asyncnotif.c.popt	2012-06-01 09:15:07.797999784 +0200
++++ openchange-1.0-BORG/testprogs/test_asyncnotif.c	2012-06-01 09:15:13.762001235 +0200
+@@ -21,7 +21,7 @@
+ 
+ #include "libmapi/libmapi.h"
+ 
+-#include <samba/popt.h>
++#include <popt.h>
+ #include <talloc.h>
+ 
+ static void popt_openchange_version_callback(poptContext con,
+diff -up openchange-1.0-BORG/utils/backup/openchangemapidump.c.popt openchange-1.0-BORG/utils/backup/openchangemapidump.c
+--- openchange-1.0-BORG/utils/backup/openchangemapidump.c.popt	2012-06-01 09:14:13.805999904 +0200
++++ openchange-1.0-BORG/utils/backup/openchangemapidump.c	2012-06-01 09:14:34.223001494 +0200
+@@ -21,7 +21,7 @@
+ */
+ 
+ #include "libmapi/libmapi.h"
+-#include <samba/popt.h>
++#include <popt.h>
+ #include <param.h>
+ 
+ #include "openchangebackup.h"
+diff -up openchange-1.0-BORG/utils/exchange2mbox.c.popt openchange-1.0-BORG/utils/exchange2mbox.c
+--- openchange-1.0-BORG/utils/exchange2mbox.c.popt	2012-06-01 09:13:06.190001927 +0200
++++ openchange-1.0-BORG/utils/exchange2mbox.c	2012-06-01 09:13:12.998000103 +0200
+@@ -20,7 +20,7 @@
+ */
+ 
+ #include "libmapi/libmapi.h"
+-#include <samba/popt.h>
++#include <popt.h>
+ #include <ldb.h>
+ 
+ #include <sys/types.h>
+diff -up openchange-1.0-BORG/utils/mapiprofile.c.popt openchange-1.0-BORG/utils/mapiprofile.c
+--- openchange-1.0-BORG/utils/mapiprofile.c.popt	2012-06-01 09:12:37.573000643 +0200
++++ openchange-1.0-BORG/utils/mapiprofile.c	2012-06-01 09:12:47.669000286 +0200
+@@ -20,7 +20,7 @@
+ */
+ 
+ #include "libmapi/libmapi.h"
+-#include <samba/popt.h>
++#include <popt.h>
+ #include <param.h>
+ #include "openchange-tools.h"
+ 
+diff -up openchange-1.0-BORG/utils/mapitest/mapitest.c.popt openchange-1.0-BORG/utils/mapitest/mapitest.c
+--- openchange-1.0-BORG/utils/mapitest/mapitest.c.popt	2012-06-01 09:13:47.148999777 +0200
++++ openchange-1.0-BORG/utils/mapitest/mapitest.c	2012-06-01 09:13:58.079000426 +0200
+@@ -22,7 +22,7 @@
+ #include "utils/mapitest/mapitest.h"
+ #include "utils/openchange-tools.h"
+ 
+-#include <samba/popt.h>
++#include <popt.h>
+ #include <param.h>
+ 
+ #include "config.h"
+diff -up openchange-1.0-BORG/utils/openchangeclient.c.popt openchange-1.0-BORG/utils/openchangeclient.c
+--- openchange-1.0-BORG/utils/openchangeclient.c.popt	2012-06-01 09:13:26.798999464 +0200
++++ openchange-1.0-BORG/utils/openchangeclient.c	2012-06-01 09:13:32.781999154 +0200
+@@ -23,7 +23,7 @@
+ #include "libmapi/libmapi_private.h"
+ #include "libmapi/mapi_nameid.h"
+ #include "libocpf/ocpf.h"
+-#include <samba/popt.h>
++#include <popt.h>
+ #include <param.h>
+ 
+ #include "openchangeclient.h"
+diff -up openchange-1.0-BORG/utils/openchangepfadmin.c.popt openchange-1.0-BORG/utils/openchangepfadmin.c
+--- openchange-1.0-BORG/utils/openchangepfadmin.c.popt	2011-06-27 23:26:39.000000000 +0200
++++ openchange-1.0-BORG/utils/openchangepfadmin.c	2012-06-01 09:10:03.688999996 +0200
+@@ -21,7 +21,7 @@
+ 
+ #include "libmapi/libmapi.h"
+ #include "libmapiadmin/libmapiadmin.h"
+-#include <samba/popt.h>
++#include <popt.h>
+ #include <param.h>
+ 
+ #include "openchangepfadmin.h"
diff --git a/openchange.spec b/openchange.spec
index 78322be..ec47cab 100644
--- a/openchange.spec
+++ b/openchange.spec
@@ -18,7 +18,7 @@
 
 Name: openchange
 Version: 1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
@@ -60,6 +60,9 @@ Patch0: libmapi-0.8.2-libmapi-conflict.patch
 # RH bug #552984
 Patch1: openchange-0.9-generate-xml-doc.patch
 
+# Use system's popt.h
+Patch2: openchange-1.0-popt.patch
+
 %description
 OpenChange provides libraries to access Microsoft Exchange servers
 using native protocols.
@@ -120,6 +123,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 -p1 -b .popt
 
 %build
 %configure \
@@ -259,6 +263,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Jun 01 2012 Milan Crha <mcrha at redhat.com> - 1.0-7
+- Add patch to use system's popt.h
+
 * Thu May 17 2012 Matthew Barnes <mbarnes at redhat.com> -1.0-6
 - Do not build openchange-server in RHEL.
   (And make disabling the subpackage actually work.)