[openchange/f17] Do not build openchange-server in RHEL.

Matthew Barnes mbarnes at fedoraproject.org
Thu May 17 18:59:31 UTC 2012


commit 77464591e48152091d8bf0810df86242656dfd33
Author: Matthew Barnes <mbarnes at redhat.com>
Date:   Thu May 17 14:59:15 2012 -0400

    Do not build openchange-server in RHEL.

 openchange.spec |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/openchange.spec b/openchange.spec
index f2b5bed..7c90a77 100644
--- a/openchange.spec
+++ b/openchange.spec
@@ -5,7 +5,12 @@
 %global nickname BORG
 
 %global build_python_package 1
+
+%if 0%{?rhel}
+%global build_server_package 0
+%else
 %global build_server_package 1
+%endif
 
 ### Abstract ###
 
@@ -13,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
@@ -157,15 +162,17 @@ rm -r $RPM_BUILD_ROOT%{python_sitearch}/openchange
 
 %if ! %{build_server_package}
 # XXX There is no configure switch to disable the server
-#     libraries in OpenChange 0.9, so just delete them.
+#     libraries in OpenChange 1.0, so just delete them.
 rm $RPM_BUILD_ROOT%{_libdir}/libmapiserver.so.*
-%endif
-
-# do not include this on RHEL
+rm $RPM_BUILD_ROOT%{_libdir}/samba/dcerpc_server/dcesrv_mapiproxy.so
+rm -r $RPM_BUILD_ROOT%{_libdir}/samba/modules/*
 %if 0%{?rhel}
-rm %{_libdir}/nagios/check_exchange
+rm $RPM_BUILD_ROOT%{_libdir}/nagios/check_exchange
+%endif
+rm -r $RPM_BUILD_ROOT%{_datadir}/setup/*
 %endif
 
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapi
 cp openchange-libmapi.devhelp $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapi
 cp -r apidocs/html/libmapi/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapi
@@ -252,6 +259,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu May 17 2012 Matthew Barnes <mbarnes at redhat.com> - 1.0-7
+- Do not build openchange-server in RHEL.
+  (And make disabling the subpackage actually work.)
+
 * Mon May 07 2012 Stephen Gallagher <sgallagh at redhat.com> - 1.0-6
 - Rebuild against samba4-4.0.0-47alpha18.fc17
 


More information about the scm-commits mailing list