On 19.5.2016 13:30, Jan Cholasta wrote:
On 19.5.2016 10:38, Martin Babinsky wrote:
On 05/19/2016 10:34 AM, Jan Cholasta wrote:
Hi,

the attached patch fixes <https://fedorahosted.org/freeipa/ticket/5889>.

Honza



ACK

Self-NACK, I have just noticed that the client-only build fails without
389-ds-base-devel installed.


Updated patch (with corrected number) attached.

--
Jan Cholasta
From f8f9a30f0b389313a0ba982c14b8a4ebef896a6e Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jchol...@redhat.com>
Date: Fri, 13 May 2016 08:40:53 +0200
Subject: [PATCH] build: fix client-only build

https://fedorahosted.org/freeipa/ticket/5889
---
 Makefile              | 7 ++++++-
 freeipa.spec.in       | 6 +++++-
 ipaclient/setup.py.in | 2 ++
 setup.py              | 2 --
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9cc4d40..210b7ac 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 include VERSION
 
 SUBDIRS=asn1 daemons install ipapython ipalib
-CLIENTDIRS=ipapython client asn1
+CLIENTDIRS=ipapython ipalib client asn1
 CLIENTPYDIRS=ipaclient ipaplatform
 
 PRJ_PREFIX=freeipa
@@ -87,6 +87,11 @@ check: bootstrap-autogen server tests
 		(cd $$subdir && $(MAKE) check) || exit 1; \
 	done
 
+client-check: client-autogen
+	@for subdir in $(CLIENTDIRS); do \
+		(cd $$subdir && $(MAKE) check) || exit 1; \
+	done
+
 bootstrap-autogen: version-update client-autogen
 	@echo "Building IPA $(IPA_VERSION)"
 	cd asn1; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 21426d2..218a98e 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -688,7 +688,11 @@ make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} client
 
 
 %check
+%if ! %{ONLY_CLIENT}
 make %{?_smp_mflags} check VERBOSE=yes
+%else
+make %{?_smp_mflags} client-check VERBOSE=yes
+%endif # ONLY_CLIENT
 
 
 %install
@@ -1127,6 +1131,7 @@ fi
 %defattr(-,root,root,-)
 %doc README Contributors.txt
 %license COPYING
+%{python_sitelib}/freeipa-*.egg-info
 %dir %{python_sitelib}/ipaserver
 %dir %{python_sitelib}/ipaserver/install
 %dir %{python_sitelib}/ipaserver/install/plugins
@@ -1365,7 +1370,6 @@ fi
 %{python_sitelib}/ipaplatform/*
 %{python_sitelib}/ipapython-*.egg-info
 %{python_sitelib}/ipalib-*.egg-info
-%{python_sitelib}/freeipa-*.egg-info
 %{python_sitelib}/ipaplatform-*.egg-info
 
 
diff --git a/ipaclient/setup.py.in b/ipaclient/setup.py.in
index af41aea..47c9b84 100644
--- a/ipaclient/setup.py.in
+++ b/ipaclient/setup.py.in
@@ -61,6 +61,8 @@ def setup_package():
             package_dir = {'ipaclient': ''},
             packages = ["ipaclient",
                        ],
+            scripts=['../ipa'],
+            data_files = [('share/man/man1', ["../ipa.1"])],
         )
     finally:
         del sys.path[0]
diff --git a/setup.py b/setup.py
index 006f34e..960a8f2 100755
--- a/setup.py
+++ b/setup.py
@@ -83,6 +83,4 @@ setup(
         'ipaserver.install.plugins',
         'ipaserver.install.server',
     ],
-    scripts=['ipa'],
-    data_files = [('share/man/man1', ["ipa.1"])],
 )
-- 
2.5.5

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to