[openchange] Add a patch to be able to build against samba 4.2.0-rc2
Milan Crha
mcrha at fedoraproject.org
Mon Nov 24 19:13:21 UTC 2014
commit 235d947b3e8a42a31a5dda555363cfe5f10d6dde
Author: Milan Crha <mcrha at redhat.com>
Date: Mon Nov 24 20:13:30 2014 +0100
Add a patch to be able to build against samba 4.2.0-rc2
openchange-2.2-samba-4.2.0-rc2.patch | 266 ++++++++++++++++++++++++++++++++++
openchange.spec | 17 ++-
2 files changed, 278 insertions(+), 5 deletions(-)
---
diff --git a/openchange-2.2-samba-4.2.0-rc2.patch b/openchange-2.2-samba-4.2.0-rc2.patch
new file mode 100644
index 0000000..d664b89
--- /dev/null
+++ b/openchange-2.2-samba-4.2.0-rc2.patch
@@ -0,0 +1,266 @@
+diff -up openchange-2.2-NANOPROBE/config.mk.in.test openchange-2.2-NANOPROBE/config.mk.in
+--- openchange-2.2-NANOPROBE/config.mk.in.test 2014-08-11 17:51:05.000000000 +0200
++++ openchange-2.2-NANOPROBE/config.mk.in 2014-11-24 19:39:04.954542514 +0100
+@@ -52,6 +52,9 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
+ SAMBA_CFLAGS=@SAMBA_CFLAGS@
+ SAMBA_LIBS=@SAMBA_LIBS@
+
++SAMBA_DEBUG_LDFLAGS=@SAMBA_DEBUG_LDFLAGS@
++SAMBA_DEBUG_LIBS=@SAMBA_DEBUG_LIBS@
++
+ LDB_CFLAGS=@LDB_CFLAGS@
+ LDB_LIBS=@LDB_LIBS@
+
+diff -up openchange-2.2-NANOPROBE/configure.ac.test openchange-2.2-NANOPROBE/configure.ac
+--- openchange-2.2-NANOPROBE/configure.ac.test 2014-11-24 19:39:04.877543200 +0100
++++ openchange-2.2-NANOPROBE/configure.ac 2014-11-24 19:44:52.196447833 +0100
+@@ -412,6 +412,12 @@ PKG_CHECK_MODULES(SAMBASERVER, dcerpc_se
+ PKG_CHECK_MODULES(TDB, tdb)
+ PKG_CHECK_MODULES(LDB, ldb)
+
++SAMBA_DEBUG_LIBS="-lsamba-debug"
++AC_SUBST(SAMBA_DEBUG_LIBS)
++
++SAMBA_DEBUG_LDFLAGS="-L`pkg-config --variable=libdir samba-util`/samba"
++AC_SUBST(SAMBA_DEBUG_LDFLAGS)
++
+ dnl ---------------------------------------------------------------------------
+ dnl Check a particular Samba4 git revision
+ dnl ---------------------------------------------------------------------------
+@@ -605,12 +611,14 @@ if test x"$enable_libpopt" = x"yes"; the
+ exchange2ical=1
+ fi
+
+- MAPISTORE_TEST=mapistore_test
++ if test x"$enable_mapiproxy" = x"yes"; then
++ MAPISTORE_TEST=mapistore_test
++ check_fasttransfer=1
++ test_asyncnotif=1
++ fi
+ mapiprofile=1
+ openchangemapidump=1
+ schemaIDGUID=1
+- check_fasttransfer=1
+- test_asyncnotif=1
+ fi
+ AC_SUBST(MAPISTORE_TEST)
+ OC_RULE_ADD(openchangeclient, TOOLS)
+diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefile
+--- openchange-2.2-NANOPROBE/Makefile.test 2014-11-24 19:39:04.808543815 +0100
++++ openchange-2.2-NANOPROBE/Makefile 2014-11-24 19:39:04.956542496 +0100
+@@ -357,7 +357,7 @@ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION)
+ libmapi++/src/session.po \
+ libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
+ @echo "Linking $@"
+- @$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) -o $@ $^ $(LIBS)
++ @$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ libmapixx-installpc:
+ @echo "[*] install: libmapi++ pc files"
+@@ -438,7 +438,7 @@ bin/libmapixx-test: libmapi++/tests/test
+ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking sample application $@"
+- @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
++ @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ clean:: libmapixx-test-clean
+
+@@ -453,7 +453,7 @@ bin/libmapixx-attach: libmapi++/tests/at
+ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking sample application $@"
+- @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
++ @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ clean:: libmapixx-attach-clean
+
+@@ -463,7 +463,7 @@ bin/libmapixx-exception: libmapi++/tests
+ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking exception test application $@"
+- @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
++ @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ libmapixx-exception-clean:
+ rm -f bin/libmapixx-exception
+@@ -483,7 +483,7 @@ bin/libmapixx-profiletest: libmapi++/tes
+ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking profile test application $@"
+- @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
++ @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ clean:: libmapixx-profiletest-clean
+
+@@ -504,7 +504,7 @@ libmapi++/examples/foldertree: libmapi++
+ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking foldertree example application $@"
+- @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
++ @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ clean:: libmapixx-foldertree-clean
+
+@@ -512,7 +512,7 @@ libmapi++/examples/messages: libmapi++/e
+ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking messages example application $@"
+- @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
++ @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ clean:: libmapixx-messages-clean
+
+@@ -579,7 +579,7 @@ libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSI
+ libmapiadmin/mapiadmin.po \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS)
++ @$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+
+
+@@ -656,7 +656,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):
+ libocpf/ocpf_write.po \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS)
++ @$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION): libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)
+ ln -fs $< $@
+@@ -728,7 +728,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT):
+ gen_ndr/ndr_exchange.po
+
+ @echo "Linking $@"
+- @$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
++ @$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ mapiproxy/dcesrv_mapiproxy.c: gen_ndr/ndr_exchange_s.c gen_ndr/ndr_exchange.c
+
+@@ -783,7 +783,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
+ mapiproxy/util/mysql.po \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS)
++ @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION): mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
+ ln -fs $< $@
+@@ -939,7 +939,7 @@ mapiproxy/libmapistore.$(SHLIBEXT).$(PAC
+ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION) -o $@ $^ $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS)
++ @$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION) -o $@ $^ $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ mapiproxy/libmapistore/mapistore_interface.po: mapiproxy/libmapistore/mapistore_nameid.h
+
+@@ -960,7 +960,7 @@ bin/mapistore_test: mapiproxy/libmapist
+ mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt -L. libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
++ @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt -L. libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ mapistore_clean:
+ rm -f mapiproxy/libmapistore/tests/*.o
+@@ -1138,7 +1138,7 @@ bin/openchangeclient: utils/openchangec
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
++ @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) $(LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+
+ ##############
+@@ -1166,7 +1166,7 @@ bin/mapiprofile: utils/mapiprofile.o
+ utils/openchange-tools.o \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
++ @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+
+ ###################
+@@ -1195,7 +1195,7 @@ bin/openchangepfadmin: utils/openchangep
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBMAPIADMIN_LIBS) -lpopt
++ @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBMAPIADMIN_LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+
+ ###################
+@@ -1226,7 +1226,7 @@ bin/exchange2mbox: utils/exchange2mbox.o
+ utils/openchange-tools.o \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(MAGIC_LIBS)
++ @$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(MAGIC_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+
+ ###################
+@@ -1290,7 +1290,7 @@ bin/exchange2ical: utils/exchange2ical_t
+ utils/openchange-tools.o \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt
++ @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ ######################
+ # testsuite
+@@ -1321,7 +1321,7 @@ bin/openchange-testsuite: testsuite/tes
+ mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
++ @$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ testsuite-check: testsuite
+ @LD_LIBRARY_PATH=. CK_XML_LOG_FILE_NAME=test_results.xml ./bin/openchange-testsuite
+@@ -1390,7 +1390,7 @@ bin/mapitest: utils/mapitest/mapitest.o
+ utils/mapitest/modules/module_lzxpress.o \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SUBUNIT_LIBS)
++ @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SUBUNIT_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ utils/mapitest/proto.h: \
+ utils/mapitest/mapitest_suite.c \
+@@ -1450,7 +1450,7 @@ bin/openchangemapidump: utils/backup/ope
+ utils/openchange-tools.o \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
++ @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+
+ ###############
+@@ -1503,7 +1503,7 @@ bin/check_fasttransfer: testprogs/check_
+ mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt
++ @$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ ###################
+ # test_asyncnotif test app.
+@@ -1529,7 +1529,7 @@ clean:: test_asyncnotif-clean
+ bin/test_asyncnotif: testprogs/test_asyncnotif.o \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt
++ @$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ ###################
+ # python code
+@@ -1574,7 +1574,7 @@ $(pythonscriptdir)/openchange/mapi.$(SHL
+ pyopenchange/pymapi_properties.c \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) $(CFLAGS) -fno-strict-aliasing $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_CFLAGS) $(PYTHON_LIBS) $(LIBS)
++ @$(CC) $(CFLAGS) -fno-strict-aliasing $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_CFLAGS) $(PYTHON_LIBS) $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ # $(pythonscriptdir)/openchange/ocpf.$(SHLIBEXT): pyopenchange/pyocpf.c \
+ # libocpf.$(SHLIBEXT).$(PACKAGE_VERSION) \
diff --git a/openchange.spec b/openchange.spec
index 148ffcd..6ce1e44 100644
--- a/openchange.spec
+++ b/openchange.spec
@@ -19,7 +19,7 @@
Name: openchange
Version: 2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/System
Summary: Provides access to Microsoft Exchange servers using native protocols
License: GPLv3+ and Public Domain
@@ -33,11 +33,12 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
-BuildRequires: community-mysql
+BuildRequires: community-mysql-devel
BuildRequires: doxygen
BuildRequires: file-devel
BuildRequires: flex
BuildRequires: gcc
+BuildRequires: gcc-c++
BuildRequires: libical-devel
BuildRequires: libldb-devel
BuildRequires: libtalloc-devel >= %{talloc_version}
@@ -75,6 +76,8 @@ Patch3: openchange-2.0-multilib-issue-libmapi-version-h.patch
# RH-bug #1028698
Patch4: openchange-1.0-symbol-clash.patch
+Patch5: openchange-2.2-samba-4.2.0-rc2.patch
+
%description
OpenChange provides libraries to access Microsoft Exchange servers
using native protocols.
@@ -139,6 +142,7 @@ This package provides the server elements for OpenChange.
%patch2 -p1 -b .OC_RULE_ADD-fix
%patch3 -p1 -b .multilib-issue-libmapi-version-h
%patch4 -p1 -b .symbol-clash
+%patch5 -p1 -b .samba-4.2.0-rc2
%build
./autogen.sh
@@ -192,9 +196,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/nagios/check_exchange
rm -r $RPM_BUILD_ROOT%{_datadir}/setup/*
%endif
-%if !%{build_python_package} && !%{build_server_package}
-rm $RPM_BUILD_ROOT%{_bindir}/check_fasttransfer
-%endif
+#%if !%{build_python_package} && !%{build_server_package}
+#rm $RPM_BUILD_ROOT%{_bindir}/check_fasttransfer
+#%endif
mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapi
cp openchange-libmapi.devhelp $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapi
@@ -285,6 +289,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Nov 24 2014 Milan Crha <mcrha at redhat.com> - 2.2-2
+- Add a patch to be able to build against samba 4.2.0-rc2
+
* Thu Aug 21 2014 Matthew Barnes <mbarnes at redhat.com> - 2.2-1
- Update to OpenChange 2.2
More information about the scm-commits
mailing list