diff --git a/custodia.spec b/custodia.spec index a66bc45..3f910be 100644 --- a/custodia.spec +++ b/custodia.spec @@ -10,9 +10,17 @@ %global with_etcd 1 %endif +# FreeIPA up to 4.4.4 are not compatible with custodia because the custodia +# script now runs under Python 3. FreeIPA 4.4.5 and 4.4.4-2 on F26 are fixed. +%if 0%{?fedora} >= 26 +%global ipa_conflict 4.4.4-2 +%else +%global ipa_conflict 4.4.5 +%endif + Name: custodia Version: 0.5.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A service to manage, retrieve and store secrets for other processes License: GPLv3+ @@ -65,10 +73,9 @@ Requires(preun): systemd-units Requires(postun): systemd-units Requires(post): systemd-units -# FreeIPA 4.3 and 4.4 up to 4.4.4 are not compatible with custodia because -# the custodia script now runs under Python 3. FreeIPA 4.4.5 has a workaround. -Conflicts: freeipa-server-common <= 4.4.4 -Conflicts: ipa-server-common < 4.4.4 +Conflicts: freeipa-server-common < %{ipa_conflict} +Conflicts: ipa-server-common < %{ipa_conflict} + %global overview \ Custodia is a Secrets Service Provider, it stores or proxies access to \ @@ -91,11 +98,11 @@ A service to manage, retrieve and store secrets for other processes Summary: Sub-package with python2 custodia modules %{?python_provide:%python_provide python2-%{name}} Requires: python2-configparser -Requires: python2-jwcrypto > 0.4.2 +Requires: python2-jwcrypto >= 0.4.2 Requires: python2-requests Requires: python2-setuptools Requires: python2-systemd -Conflicts: python2-ipalib < 4.4.5 +Conflicts: python2-ipalib < %{ipa_conflict} %description -n python2-custodia Sub-package with python custodia modules @@ -123,7 +130,7 @@ Requires: python%{python3_pkgversion}-jwcrypto >= 0.4.2 Requires: python%{python3_pkgversion}-requests Requires: python%{python3_pkgversion}-setuptools Requires: python%{python3_pkgversion}-systemd -Conflicts: python%{python3_pkgversion}-ipalib < 4.4.5 +Conflicts: python%{python3_pkgversion}-ipalib < %{ipa_conflict} %description -n python%{python3_pkgversion}-custodia Sub-package with python custodia modules @@ -279,6 +286,10 @@ exit 0 %changelog +* Mon Aug 07 2017 Christian Heimes - 0.5.0-9 +- freeipa 4.4.4-2.fc26 and newer are compatible with custodia 0.5 +- Fix dependency to python2-jwcrypto >= 0.4.2 + * Wed Aug 02 2017 Christian Heimes - 0.5.0-8 - Add PIP_IGNORE_INSTALLED