diff --git a/conda.spec b/conda.spec index 878f387..4353bdc 100644 --- a/conda.spec +++ b/conda.spec @@ -3,7 +3,7 @@ Name: conda Version: 4.5.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform, Python-agnostic binary package manager License: BSD and ASL 2.0 and LGPLv2+ and MIT @@ -25,7 +25,7 @@ Patch10001: 0001-Fix-failing-tests-in-test_api.py.patch BuildArch: noarch -Requires: python3-conda = %{version}-%{release} +Requires: python%{python3_pkgversion}-conda = %{version}-%{release} # Removed upstream in favour of calling "conda activate" in version 4.4.0 Obsoletes: conda-activate < 4.4 @@ -72,7 +72,10 @@ BuildRequires: python2-setuptools BuildRequires: %py2_reqs BuildRequires: python2-requests # When this is present, vendored toolz should not be used +%if 0%{?fedora} +# EPEL does not have new enough cytoolz BuildRequires: python2-cytoolz +%endif # For tests BuildRequires: python2-enum34 BuildRequires: python2-futures @@ -85,7 +88,10 @@ BuildRequires: python2-pytest-cov Requires: %py2_reqs Requires: python2-enum34 Requires: python2-futures +%if 0%{?fedora} +# EPEL does not have new enough cytoolz Requires: python2-cytoolz +%endif Provides: %py2_bund %{?python_provide:%python_provide python2-conda} @@ -101,14 +107,20 @@ BuildRequires: %py3_reqs BuildRequires: python%{python3_pkgversion}-requests BuildRequires: python%{python3_pkgversion}-yaml # When this is present, vendored toolz should not be used +%if 0%{?fedora} +# EPEL does not have new enough cytoolz BuildRequires: python%{python3_pkgversion}-cytoolz +%endif # For tests BuildRequires: python%{python3_pkgversion}-pytest-cov Requires: %py3_reqs Requires: python%{python3_pkgversion}-requests Requires: python%{python3_pkgversion}-yaml +%if 0%{?fedora} +# EPEL does not have new enough cytoolz Requires: python%{python3_pkgversion}-cytoolz +%endif Provides: %py3_bund %{?python_provide:%python_provide python%{python3_pkgversion}-conda} @@ -132,7 +144,10 @@ sed -r -i 's/\btest_list\b/_disabled_\0/' tests/test_cli.py sed -r -i '1 {/#![/]usr[/]bin[/]env/d}' conda/_vendor/appdirs.py # Replaced by cytools, byte compilation fails under python3.7 +%if 0%{?fedora} +# EPEL does not have new enough cytoolz rm -r conda/_vendor/toolz +%endif %build # build conda executable @@ -166,6 +181,8 @@ EOF mkdir -p %{buildroot}%{_localstatedir}/cache/conda/pkgs/cache +# install does not create the directory on EL7 +mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -Dt %{buildroot}/etc/profile.d/ conda/shell/etc/profile.d/conda.{sh,csh} sed -r -i '1i _CONDA_EXE=%{_bindir}/conda' %{buildroot}/etc/profile.d/conda.sh sed -r -i -e '1i set _CONDA_EXE=%{_bindir}/conda' \ @@ -211,6 +228,9 @@ py.test-%{python2_version} -vv -m "not integration" -k "not test_unicode" %changelog +* Mon Dec 31 2018 Orion Poplawski - 4.5.11-2 +- EPEL7 compatability + * Fri Sep 21 2018 Zbigniew Jędrzejewski-Szmek - 4.5.11-1 - Update to latest stable version (#1570217) - Disable python2 subpackage on F30+