[openchange] Disable build of python and mapiproxy
Milan Crha
mcrha at fedoraproject.org
Tue Jul 10 14:41:28 UTC 2012
commit 729253a03b7e072a54ca3c458e189898311bdd2a
Author: Milan Crha <mcrha at redhat.com>
Date: Tue Jul 10 16:41:11 2012 +0200
Disable build of python and mapiproxy
openchange-1.0-OC_RULE_ADD-fix.patch | 71 +++++++++++++++++++++++++---------
openchange.spec | 17 +++++---
2 files changed, 63 insertions(+), 25 deletions(-)
---
diff --git a/openchange-1.0-OC_RULE_ADD-fix.patch b/openchange-1.0-OC_RULE_ADD-fix.patch
index 9c08e5b..ff33698 100644
--- a/openchange-1.0-OC_RULE_ADD-fix.patch
+++ b/openchange-1.0-OC_RULE_ADD-fix.patch
@@ -1,6 +1,7 @@
---- openchange-1.0-BORG/configure.ac 2012-03-15 15:50:43.000000000 +0200
-+++ openchange-1.0-BORG.new/configure.ac 2012-06-01 14:38:52.175821507 +0300
-@@ -103,7 +103,7 @@
+diff -up openchange-1.0-BORG/configure.ac.OC_RULE_ADD-fix openchange-1.0-BORG/configure.ac
+--- openchange-1.0-BORG/configure.ac.OC_RULE_ADD-fix 2012-03-15 14:50:43.000000000 +0100
++++ openchange-1.0-BORG/configure.ac 2012-07-10 15:44:04.081401855 +0200
+@@ -103,7 +103,7 @@ AC_DEFUN([OC_RULE_ADD],
[
AC_ARG_VAR([NAME], [rule name])
AC_ARG_VAR([TYPE], [rule type])
@@ -9,7 +10,7 @@
case "$2" in
LIBS)
OC_$2="$OC_$2 $1"
-@@ -361,7 +361,8 @@
+@@ -361,7 +361,8 @@ dnl Samba4 modules
dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(TALLOC, talloc)
PKG_CHECK_MODULES(SAMBA, dcerpc ndr samba-hostconfig samba-util tevent samba-credentials)
@@ -19,7 +20,7 @@
PKG_CHECK_MODULES(TDB, tdb)
PKG_CHECK_MODULES(LDB, ldb)
-@@ -387,6 +388,9 @@
+@@ -387,6 +388,9 @@ AC_MSG_RESULT($DCERPC_SERVER_MODULESDIR)
dnl ---------------------------------------------------------------------------
dnl Finally add libmapi to the library list
dnl ---------------------------------------------------------------------------
@@ -29,7 +30,7 @@
OC_RULE_ADD(libmapi, LIBS)
dnl nasty hack: only compile IDL if we have a library
-@@ -489,6 +493,7 @@
+@@ -489,6 +493,7 @@ AC_CACHE_CHECK([for boost_thread$BOOST_L
if test x"$ac_cv_libmapixx_gxx_works" = "xyes"; then
if test x"$ov_cv_boost_thread" = "xyes"; then
AC_PROG_CXX
@@ -37,7 +38,7 @@
OC_RULE_ADD(libmapixx, LIBS)
fi
fi
-@@ -506,10 +511,12 @@
+@@ -506,10 +511,12 @@ if test x"$OPENCHANGE_VERSION_IS_SVN_SNA
AC_PATH_PROG([BISON], [bison], [bison])
if test x"$BISON" != x""; then
@@ -50,7 +51,7 @@
OC_RULE_ADD(libocpf, LIBS)
fi
-@@ -527,6 +534,7 @@
+@@ -527,6 +534,7 @@ PKG_CHECK_EXISTS([ dcerpc_samr ],
if test x"$enable_libmapiadmin" = x"yes"; then
PKG_CHECK_MODULES(SAMR, dcerpc_samr ndr_standard)
@@ -58,7 +59,7 @@
OC_RULE_ADD(libmapiadmin, LIBS)
fi
-@@ -561,28 +569,37 @@
+@@ -561,28 +569,37 @@ AC_CHECK_LIB([popt], [poptFreeContext],
if test x"$enable_libpopt" = x"yes"; then
if test x"$enable_libmapiadmin" = x"yes"; then
@@ -107,7 +108,7 @@
dnl --------------------------------------------------------------------------
dnl Check for libmagic
-@@ -605,9 +622,10 @@
+@@ -605,9 +622,10 @@ if test x"$enable_libmagic" = x"yes"; th
AC_MSG_ERROR([Z library not found, please install zlib-devel.], [1])
])
if test x"$enable_libpopt" = x"yes"; then
@@ -119,22 +120,56 @@
dnl ##########################################################################
dnl libmapistore dependencies
-@@ -644,8 +662,11 @@
+@@ -640,11 +658,23 @@ AC_SUBST(OC_MAPISTORE_CLEAN)
+ AC_SUBST(OC_MAPISTORE_INSTALL)
+ AC_SUBST(OC_MAPISTORE_UNINSTALL)
+
++OC_SERVER=
++OC_SERVER_CLEAN=
++OC_SERVER_INSTALL=
++OC_SERVER_UNINSTALL=
++AC_SUBST(OC_SERVER)
++AC_SUBST(OC_SERVER_CLEAN)
++AC_SUBST(OC_SERVER_INSTALL)
++AC_SUBST(OC_SERVER_UNINSTALL)
++
+ dnl ##########################################################################
dnl mapiproxy server
dnl ##########################################################################
if test x$PYTHON != x; then
- OC_RULE_ADD(mapiproxy, SERVER)
+ if test "x$SAMDB_LIBS" != x -a "x$SAMBASERVER_LIBS" != x ; then
+ mapiproxy=1
++ OC_RULE_ADD(mapiproxy, SERVER)
+ fi
fi
-+OC_RULE_ADD(mapiproxy, SERVER)
AC_ARG_WITH(modulesdir,
- [AS_HELP_STRING([--with-modulesdir], [Modules path to use])],
---- openchange-1.0-BORG/Makefile 2012-06-01 14:40:30.872485845 +0300
-+++ openchange-1.0-BORG.new/Makefile 2012-06-01 14:26:18.975993983 +0300
-@@ -722,7 +722,7 @@
+@@ -664,10 +694,16 @@ AC_ARG_ENABLE(pymapi, AC_HELP_STRING([--
+ PYCDIR=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='\\$(prefix)')"`
+ AC_SUBST(PYCDIR)
+
+-dnl Enable pyopenchange by default
+-PYMAPIALL="$PYMAPIALL pyopenchange"
+-PYMAPIINSTALL="$PYMAPIALLINSTALL pyopenchange-install"
+-PYMAPIUNINSTALL="$PYMAPIUNINSTALL pyopenchange-uninstall"
++PYMAPIALL=
++PYMAPIINSTALL=
++PYMAPIUNINSTALL=
++
++if test x$enable_pymapi = xyes ; then
++ dnl Enable pyopenchange by default
++ PYMAPIALL="$PYMAPIALL pyopenchange"
++ PYMAPIINSTALL="$PYMAPIALLINSTALL pyopenchange-install"
++ PYMAPIUNINSTALL="$PYMAPIUNINSTALL pyopenchange-uninstall"
++fi
+
+ AC_SUBST(PYMAPIALL)
+ AC_SUBST(PYMAPIINSTALL)
+diff -up openchange-1.0-BORG/Makefile.OC_RULE_ADD-fix openchange-1.0-BORG/Makefile
+--- openchange-1.0-BORG/Makefile.OC_RULE_ADD-fix 2012-07-10 15:08:00.017882690 +0200
++++ openchange-1.0-BORG/Makefile 2012-07-10 15:08:00.042883018 +0200
+@@ -722,7 +722,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT):
gen_ndr/ndr_exchange.po
@echo "Linking $@"
@@ -143,7 +178,7 @@
mapiproxy/dcesrv_mapiproxy.c: gen_ndr/ndr_exchange_s.c gen_ndr/ndr_exchange.c
-@@ -1031,7 +1031,7 @@
+@@ -1031,7 +1031,7 @@ mapiproxy/servers/exchange_nsp.$(SHLIBEX
mapiproxy/servers/default/nspi/emsabp_tdb.po \
mapiproxy/servers/default/nspi/emsabp_property.po
@echo "Linking $@"
@@ -152,7 +187,7 @@
mapiproxy/servers/exchange_emsmdb.$(SHLIBEXT): mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.po \
mapiproxy/servers/default/emsmdb/emsmdbp.po \
-@@ -1048,13 +1048,13 @@
+@@ -1048,13 +1048,13 @@ mapiproxy/servers/exchange_emsmdb.$(SHLI
mapiproxy/servers/default/emsmdb/oxorule.po \
mapiproxy/servers/default/emsmdb/oxcperm.po
@echo "Linking $@"
diff --git a/openchange.spec b/openchange.spec
index 929db7f..6f4bab0 100644
--- a/openchange.spec
+++ b/openchange.spec
@@ -4,7 +4,7 @@
%global talloc_version 2.0.5
%global nickname BORG
-%global build_python_package 1
+%global build_python_package 0
%if 0%{?rhel}
%global build_server_package 0
@@ -171,15 +171,15 @@ cp -r doc/man/man1 $RPM_BUILD_ROOT%{_mandir}
# cp -r apidocs/man/man3 $RPM_BUILD_ROOT%{_mandir}
rm -r apidocs/man/man3
-%if ! %{build_python_package}
-rm -r $RPM_BUILD_ROOT%{python_sitearch}/openchange
-%endif
+#%if ! %{build_python_package}
+#rm -r $RPM_BUILD_ROOT%{python_sitearch}/openchange
+#%endif
%if ! %{build_server_package}
# XXX OC_RULE_ADD patch disables build of this, no need to delete it.
-rm $RPM_BUILD_ROOT%{_libdir}/libmapiserver.so.*
-rm -r $RPM_BUILD_ROOT%{_libdir}/samba/modules/*
-rm $RPM_BUILD_ROOT%{_libdir}/samba/dcerpc_server/dcesrv_mapiproxy.so
+#rm $RPM_BUILD_ROOT%{_libdir}/libmapiserver.so.*
+#rm -r $RPM_BUILD_ROOT%{_libdir}/samba/modules/*
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/dcerpc_server/dcesrv_mapiproxy.so
rm $RPM_BUILD_ROOT%{_libdir}/nagios/check_exchange
rm -r $RPM_BUILD_ROOT%{_datadir}/setup/*
%endif
@@ -227,8 +227,10 @@ rm -rf $RPM_BUILD_ROOT
%doc ChangeLog COPYING IDL_LICENSE.txt VERSION
%{_libdir}/libmapi-openchange.so.*
%{_libdir}/libmapiadmin.so.*
+%if %{build_python_package} || %{build_server_package}
%{_libdir}/libmapiproxy.so.*
%{_libdir}/libmapistore.so.*
+%endif
%{_libdir}/libocpf.so.*
%files devel
@@ -273,6 +275,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Jul 10 2012 Milan Crha <mcrha at redhat.com> - 1.0-8
- Add patch for OpenChange bug #397 (crash under MAPIUninitialize)
+- Disable build of python and mapiproxy
* Fri Jun 01 2012 Milan Crha <mcrha at redhat.com> - 1.0-7
- Add patch to use system's popt.h
More information about the scm-commits
mailing list