From 9fa8cff6da6b6b85aa5b03028386f159fc816124 Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Wed, 17 Sep 2014 11:49:51 +0200
Subject: [PATCH] Include ipaplatform in client-only build

https://fedorahosted.org/freeipa/ticket/4533

Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
---
 Makefile        | 6 ++++++
 freeipa.spec.in | 3 +++
 setup.py        | 3 ---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index ddb47bfd5..3bdec716d 100644
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,7 @@ client: client-autogen
 	@for subdir in $(CLIENTDIRS); do \
 		(cd $$subdir && $(MAKE) all) || exit 1; \
 	done
+	cd ipaplatform && $(PYTHON) setup.py build
 
 bootstrap-autogen: version-update client-autogen
 	@echo "Building IPA $(IPA_VERSION)"
@@ -96,8 +97,10 @@ client-install: client client-dirs
 	cd install/po && $(MAKE) install || exit 1;
 	if [ "$(DESTDIR)" = "" ]; then \
 		$(PYTHON) setup-client.py install; \
+		(cd ipaplatform && $(PYTHON) setup.py install); \
 	else \
 		$(PYTHON) setup-client.py install --root $(DESTDIR); \
+		(cd ipaplatform && $(PYTHON) setup.py install --root $(DESTDIR)); \
 	fi
 
 client-dirs:
@@ -164,12 +167,15 @@ version-update: release-update
 
 server: version-update
 	$(PYTHON) setup.py build
+	cd ipaplatform && $(PYTHON) setup.py build
 
 server-install: server
 	if [ "$(DESTDIR)" = "" ]; then \
 		$(PYTHON) setup.py install; \
+		(cd ipaplatform && $(PYTHON) setup.py install); \
 	else \
 		$(PYTHON) setup.py install --root $(DESTDIR); \
+		(cd ipaplatform && $(PYTHON) setup.py install --root $(DESTDIR)); \
 	fi
 
 tests: version-update tests-man-autogen
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 967a51bb4..4bafc7067 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -343,6 +343,8 @@ make client-install DESTDIR=%{buildroot}
 %find_lang %{gettext_domain}
 
 
+mkdir -p %{buildroot}%{_usr}/share/ipa
+
 %if ! %{ONLY_CLIENT}
 # Remove .la files from libtool - we don't want to package
 # these files
@@ -795,6 +797,7 @@ fi
 %attr(0644,root,root) %{python_sitearch}/default_encoding_utf8.so
 %{python_sitelib}/ipapython-*.egg-info
 %{python_sitelib}/freeipa-*.egg-info
+%{python_sitelib}/ipaplatform-*.egg-info
 %{python_sitearch}/python_default_encoding-*.egg-info
 %dir %attr(0755,root,root) %{_sysconfdir}/ipa/
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf
diff --git a/setup.py b/setup.py
index af968e173..af7964d60 100755
--- a/setup.py
+++ b/setup.py
@@ -78,9 +78,6 @@ setup(
     packages=[
         'ipalib',
         'ipalib.plugins',
-        'ipaplatform',
-        'ipaplatform.base',
-        'ipaplatform.fedora',
         'ipaserver',
         'ipaserver.advise',
         'ipaserver.advise.plugins',