diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2014-09-17 11:49:51 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2014-09-23 20:28:47 +0200 |
| commit | df187a4b4a9a2eeac8b11152de0cdc250e55cfb1 (patch) | |
| tree | e815c3ef53df690591cfef8109b4bafac391ef3a | |
| parent | faba3f060e7513790d584bde3a9901793031fcf1 (diff) | |
| download | freeipa-df187a4b4a9a2eeac8b11152de0cdc250e55cfb1.tar.gz freeipa-df187a4b4a9a2eeac8b11152de0cdc250e55cfb1.tar.xz freeipa-df187a4b4a9a2eeac8b11152de0cdc250e55cfb1.zip | |
Include ipaplatform in client-only build
https://fedorahosted.org/freeipa/ticket/4533
Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | freeipa.spec.in | 3 | ||||
| -rwxr-xr-x | setup.py | 3 |
3 files changed, 9 insertions, 3 deletions
@@ -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 0e2b27955..dfa81856b 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 @@ -789,6 +791,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 @@ -78,9 +78,6 @@ setup( packages=[ 'ipalib', 'ipalib.plugins', - 'ipaplatform', - 'ipaplatform.base', - 'ipaplatform.fedora', 'ipaserver', 'ipaserver.advise', 'ipaserver.advise.plugins', |