URL: https://github.com/freeipa/freeipa/pull/597 Author: HonzaCholasta Title: #597: spec file: support build without ipatests Action: synchronized
To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/597/head:pr597 git checkout pr597
From b18265c4c4c16d9068591c4e684eda054512799c Mon Sep 17 00:00:00 2001 From: Jan Cholasta <jchol...@redhat.com> Date: Wed, 15 Mar 2017 09:30:14 +0100 Subject: [PATCH] spec file: support build without ipatests Build ipatests only if %with_ipatests RPM macro is specified. By default the macro is specified if ONLY_CLIENT is not specified. https://pagure.io/freeipa/issue/6517 --- freeipa.spec.in | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index ad35534..d07f433 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -2,6 +2,16 @@ # subpackages %{!?ONLY_CLIENT:%global ONLY_CLIENT 0} +# Build with ipatests +%if ! %{ONLY_CLIENT} + %global with_ipatests 1 +%endif +%if 0%{?with_ipatests} + %global with_ipatests_option --with-ipatests +%else + %global with_ipatests_option --without-ipatests +%endif + %if 0%{?rhel} %global with_python3 0 %else @@ -712,7 +722,7 @@ and integration with Active Directory based infrastructures (Trusts). If you are using IPA, you need to install this package. -%if ! %{ONLY_CLIENT} +%if 0%{?with_ipatests} %package -n python2-ipatests Summary: IPA tests and test tools @@ -780,7 +790,7 @@ This package contains tests that verify IPA functionality under Python 3. %endif # with_python3 -%endif # ONLY_CLIENT +%endif # with_ipatests %prep @@ -807,6 +817,7 @@ find \ -type f -exec grep -qsm1 '^#!.*\bpython' {} \; \ -exec sed -i -e '1 s|^#!.*\bpython[^ ]*|#!%{__python2}|' {} \; %configure --with-vendor-suffix=-%{release} \ + %{with_ipatests_option} \ %{enable_pylint_option} \ %{?without_jslint_option} @@ -825,6 +836,7 @@ find \ -type f -exec grep -qsm1 '^#!.*\bpython' {} \; \ -exec sed -i -e '1 s|^#!.*\bpython[^ ]*|#!%{__python3}|' {} \; %configure --with-vendor-suffix=-%{release} \ + %{with_ipatests_option} \ %{enable_pylint_option} \ %{?without_jslint_option} popd @@ -861,19 +873,26 @@ pushd %{_builddir}/freeipa-%{version}-python3 (cd ipaplatform && %make_install) (cd ipapython && %make_install) (cd ipaserver && %make_install) +%if 0%{?with_ipatests} (cd ipatests && %make_install) +%endif # with_ipatests popd +%if 0%{?with_ipatests} mv %{buildroot}%{_bindir}/ipa-run-tests %{buildroot}%{_bindir}/ipa-run-tests-%{python3_version} mv %{buildroot}%{_bindir}/ipa-test-config %{buildroot}%{_bindir}/ipa-test-config-%{python3_version} mv %{buildroot}%{_bindir}/ipa-test-task %{buildroot}%{_bindir}/ipa-test-task-%{python3_version} ln -s %{_bindir}/ipa-run-tests-%{python3_version} %{buildroot}%{_bindir}/ipa-run-tests-3 ln -s %{_bindir}/ipa-test-config-%{python3_version} %{buildroot}%{_bindir}/ipa-test-config-3 ln -s %{_bindir}/ipa-test-task-%{python3_version} %{buildroot}%{_bindir}/ipa-test-task-3 +%endif # with_ipatests + %endif # with_python3 # Python 2 installation %make_install + +%if 0%{?with_ipatests} mv %{buildroot}%{_bindir}/ipa-run-tests %{buildroot}%{_bindir}/ipa-run-tests-%{python2_version} mv %{buildroot}%{_bindir}/ipa-test-config %{buildroot}%{_bindir}/ipa-test-config-%{python2_version} mv %{buildroot}%{_bindir}/ipa-test-task %{buildroot}%{_bindir}/ipa-test-task-%{python2_version} @@ -884,7 +903,7 @@ ln -s %{_bindir}/ipa-test-task-%{python2_version} %{buildroot}%{_bindir}/ipa-tes ln -s %{_bindir}/ipa-run-tests-%{python2_version} %{buildroot}%{_bindir}/ipa-run-tests ln -s %{_bindir}/ipa-test-config-%{python2_version} %{buildroot}%{_bindir}/ipa-test-config ln -s %{_bindir}/ipa-test-task-%{python2_version} %{buildroot}%{_bindir}/ipa-test-task - +%endif # with_ipatests # remove files which are useful only for make uninstall find %{buildroot} -wholename '*/site-packages/*/install_files.txt' -exec rm {} \; @@ -1454,7 +1473,7 @@ fi %endif # with_python3 -%if ! %{ONLY_CLIENT} +%if 0%{?with_ipatests} %files -n python2-ipatests %defattr(-,root,root,-) @@ -1492,7 +1511,7 @@ fi %endif # with_python3 -%endif # ONLY_CLIENT +%endif # with_ipatests %changelog
-- 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
