From 61097a60074ad8f28f1b7d28bcd2d0264f39c635 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sep 21 2018 15:31:37 +0000 Subject: Disable python2 subpackage on F30+ --- diff --git a/conda.spec b/conda.spec index e2aef2b..878f387 100644 --- a/conda.spec +++ b/conda.spec @@ -1,4 +1,5 @@ %{!?_with_bootstrap: %global bootstrap 0} +%global with_python2 0%{?fedora} < 30 Name: conda Version: 4.5.11 @@ -62,6 +63,7 @@ entirely in Python. %global py2_bund %(c="%_py2_bund"; echo "$c" | xargs) %global py3_bund %(c="%_py2_bund"; echo "$c" | sed s/python2/python%{python3_pkgversion}/ | xargs) +%if %with_python2 %package -n python2-conda Summary: %{summary} @@ -88,6 +90,7 @@ Provides: %py2_bund %{?python_provide:%python_provide python2-conda} %description -n python2-conda %_description +%endif %package -n python%{python3_pkgversion}-conda Summary: %{summary} @@ -134,19 +137,25 @@ rm -r conda/_vendor/toolz %build # build conda executable %define py_setup utils/setup-testing.py +%if %with_python2 %py2_build +%endif %py3_build %install # install conda executable %define py_setup utils/setup-testing.py %if 0%{?fedora} +%if %with_python2 %py2_install +%endif %py3_install %else %py3_install +%if %with_python2 %py2_install %endif +%endif mkdir -p %{buildroot}%{_datadir}/conda/condarc.d cat >%{buildroot}%{_datadir}/conda/condarc.d/defaults.yaml < - 4.5.11-1 - Update to latest stable version (#1570217) +- Disable python2 subpackage on F30+ * Fri Jul 13 2018 Zbigniew Jędrzejewski-Szmek - 4.4.11-4 - Pull in python[23]-cytoolz to replace bundled toolz