URL: https://github.com/freeipa/freeipa/pull/2329 Author: tiran Title: #2329: [Backport][ipa-4-7] Adapt freeipa.spec.in for latest Fedora, fix python2 ipatests packaging bug Action: opened
PR body: """ This PR was opened automatically because PR #2325 was pushed to master and backport to ipa-4-7 is required. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/2329/head:pr2329 git checkout pr2329
From 5437605162c2602757de452c76ddb6491f6aa4de Mon Sep 17 00:00:00 2001 From: Thomas Woerner <twoer...@redhat.com> Date: Tue, 4 Sep 2018 15:24:21 +0200 Subject: [PATCH] Adapt freeipa.spec.in for latest Fedora, fix python2 ipatests packaging bug New autoreconf -ivf call before configure --- freeipa.spec.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 5812c9127b..ffa12a776d 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -1,7 +1,9 @@ # 389-ds-base 1.4 no longer supports i686 platform, build only client # packages, https://bugzilla.redhat.com/show_bug.cgi?id=1544386 -%ifarch %{ix86} -%{!?ONLY_CLIENT:%global ONLY_CLIENT 1} +%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 + %ifarch %{ix86} + %{!?ONLY_CLIENT:%global ONLY_CLIENT 1} + %endif %endif # Define ONLY_CLIENT to only make the ipa-client and ipa-python @@ -961,6 +963,7 @@ find \ -type f -exec grep -qsm1 '^#!.*\bpython' {} \; \ -exec sed -i -e '1 s|^#!.*\bpython[^ ]*|#!%{__python2}|' {} \; +autoreconf -ivf %configure --with-vendor-suffix=-%{release} \ %{enable_server_option} \ %{with_ipatests_option} \ @@ -970,6 +973,7 @@ popd export PYTHON=%{__python3} pushd %{_builddir}/freeipa-%{version}-python3 +autoreconf -ivf %configure --with-vendor-suffix=-%{release} \ %{enable_server_option} \ %{with_ipatests_option} \ @@ -1016,7 +1020,7 @@ ln -rs %{buildroot}%{_bindir}/ipa-test-task-%{python3_version} %{buildroot}%{_bi pushd %{_builddir}/freeipa-%{version}-python2 %{__make} python_install DESTDIR=%{?buildroot} INSTALL="%{__install} -p" popd -%if 0%{?with_python2} && 0%{?fedora} < 29 +%if 0%{?with_ipatests} && 0%{?fedora} < 29 # Fedora 29 workaround: don't ship ipatests binaries 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}
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org
