[openchange] Enable server and python subpackages; man files movement
Milan Crha
mcrha at fedoraproject.org
Tue Mar 20 14:43:18 UTC 2012
commit 743e964172342e0a0b6cef8bd21e5402876b8805
Author: Milan Crha <mcrha at redhat.com>
Date: Tue Mar 20 15:42:20 2012 +0100
Enable server and python subpackages; man files movement
openchange.spec | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
---
diff --git a/openchange.spec b/openchange.spec
index 9d91ae4..95fcd0b 100644
--- a/openchange.spec
+++ b/openchange.spec
@@ -4,8 +4,8 @@
%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,11 +139,6 @@ 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}
@@ -144,10 +147,6 @@ 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
-
%if ! %{build_python_package}
rm -r $RPM_BUILD_ROOT%{python_sitearch}/openchange
%endif
@@ -203,24 +202,22 @@ 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/*
+
+%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 devel-docs
-%defattr(-,root,root,-)
-%doc %{_datadir}/devhelp/books/*
-
%files client
%defattr(-,root,root,-)
%{_bindir}/*
@@ -237,11 +234,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
-* Mon Mar 19 2012 Milan Crha <mcrha at redhat.com> - 1.0-1
+* Tue Mar 20 2012 Milan Crha <mcrha at redhat.com> - 1.0-1
- Update to 1.0
+- Enable packages for server part and python bindings
+- Move man pages from devel to devel-docs package
* 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
More information about the scm-commits
mailing list