[openchange/f17] Sync with rawhide .spec file

[Milan Crha]

commit 65cbbdec7434aa3e2b449b3d2cb41fb9480f3c8f
Author: Milan Crha <mcrha at redhat.com>
Date:   Wed Apr 4 18:11:45 2012 +0200

    Sync with rawhide .spec file

 openchange.spec |   48 +++++++++++++++++++++++++++---------------------
 1 files changed, 27 insertions(+), 21 deletions(-)
---
diff --git a/openchange.spec b/openchange.spec
index 91f8d07..7e588fe 100644
--- a/openchange.spec
+++ b/openchange.spec
@@ -1,11 +1,11 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%global samba4_version 4.0.0-103.alpha18
+%global samba4_version 4.0.0-39alpha18
 %global talloc_version 2.0.5
 %global nickname BORG
 
-%global build_python_package 0
-%global build_server_package 0
+%global build_python_package 1
+%global build_server_package 1
 
 ### Abstract ###
 
@@ -28,6 +28,7 @@ BuildRequires: bison
 BuildRequires: doxygen
 BuildRequires: file-devel
 BuildRequires: flex
+BuildRequires: gcc
 BuildRequires: libldb-devel
 BuildRequires: libtalloc-devel >= %{talloc_version}
 BuildRequires: libtdb-devel
@@ -56,12 +57,14 @@ Patch1: openchange-0.9-generate-xml-doc.patch
 %description
 OpenChange provides libraries to access Microsoft Exchange servers
 using native protocols.
-Requires: devhelp
 
 %package devel
 Summary: Developer tools for OpenChange libraries
 Group: Development/Libraries
 Requires: openchange = %{version}-%{release}
+%if %{build_server_package}
+Requires: openchange-server = %{version}-%{release}
+%endif
 
 %description devel
 This package provides the development tools and headers for
@@ -71,6 +74,7 @@ using native protocols.
 %package devel-docs
 Summary: Developer documentation for OpenChange libraries
 Group: Development/Libraries
+Requires: devhelp
 Requires: openchange = %{version}-%{release}
 
 %description devel-docs
@@ -112,7 +116,11 @@ This package provides the server elements for OpenChange.
 %patch1 -p1 -b .generate-xml-doc
 
 %build
-%configure
+%configure \
+%if %{build_python_package}
+	--enable-pymapi \
+%endif
+	--with-modulesdir=%{_libdir}/samba/modules
 
 # Parallel builds prohibited by makefile
 make
@@ -131,22 +139,16 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 cp -r libmapi++ $RPM_BUILD_ROOT%{_includedir}
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/nagios/check_exchange
-rm -rf $RPM_BUILD_ROOT%{_prefix}/modules
-rm -rf $RPM_BUILD_ROOT%{_datadir}/js
-rm -rf $RPM_BUILD_ROOT%{_datadir}/setup
-
 # This makes the right links, as rpmlint requires that the
 # ldconfig-created links be recorded in the RPM.
 /sbin/ldconfig -N -n $RPM_BUILD_ROOT/%{_libdir}
 
 mkdir $RPM_BUILD_ROOT%{_mandir}
 cp -r doc/man/man1 $RPM_BUILD_ROOT%{_mandir}
-cp -r apidocs/man/man3 $RPM_BUILD_ROOT%{_mandir}
 
-# Avoid a file conflict with man-pages package.
-# Page is still reachable as "mapi_obj_bookmark".
-rm -rf $RPM_BUILD_ROOT%{_mandir}/man3/index.3
+# Skip man3 for now, it doesn't work anyway
+# 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
@@ -203,23 +205,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libmapiproxy.so.*
 %{_libdir}/libmapistore.so.*
 %{_libdir}/libocpf.so.*
-%{_libdir}/mapistore_backends/mapistore_fsocpf.so
-%{_libdir}/mapistore_backends/mapistore_mstoredb.so
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
-%{_mandir}/man3/*
-%doc apidocs/html/libmapi
-%doc apidocs/html/libocpf
-%doc apidocs/html/overview
-%doc apidocs/html/index.html
 
 %files devel-docs
 %defattr(-,root,root,-)
+#%{_mandir}/man3/*
 %doc %{_datadir}/devhelp/books/*
+%doc apidocs/html/libmapi
+%doc apidocs/html/libocpf
+%doc apidocs/html/overview
+%doc apidocs/html/index.html
 
 %files client
 %defattr(-,root,root,-)
@@ -237,11 +237,17 @@ rm -rf $RPM_BUILD_ROOT
 %files server
 %defattr(-,root,root,-)
 %{_libdir}/libmapiserver.so.*
+%{_libdir}/samba/dcerpc_server/dcesrv_mapiproxy.so
+%{_libdir}/samba/modules/*
+%{_libdir}/nagios/check_exchange
+%{_datadir}/setup/*
 %endif
 
 %changelog
 * Wed Apr 04 2012 Milan Crha <mcrha at redhat.com> - 1.0-1
 - Update to 1.0
+- Enable packages for server part and python bindings
+- Skip man3 pages, which are generated incomplete (use devhelp instead)
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild