diff --git a/0004-Do-not-try-to-run-usr-bin-python.patch b/0004-Do-not-try-to-run-usr-bin-python.patch index e183da7..03616cc 100644 --- a/0004-Do-not-try-to-run-usr-bin-python.patch +++ b/0004-Do-not-try-to-run-usr-bin-python.patch @@ -1,5 +1,5 @@ diff --git a/conda/common/path.py b/conda/common/path.py -index 41084ec..11282f3 100644 +index ae8fe27..c011308 100644 --- a/conda/common/path.py +++ b/conda/common/path.py @@ -9,6 +9,7 @@ import os @@ -9,8 +9,8 @@ index 41084ec..11282f3 100644 +import sys from typing import Iterable, Sequence from urllib.parse import urlsplit - import warnings -@@ -166,9 +167,11 @@ def parse_entry_point_def(ep_definition): + +@@ -161,9 +162,11 @@ def parse_entry_point_def(ep_definition): def get_python_short_path(python_version=None): if on_win: return "python.exe" diff --git a/conda.spec b/conda.spec index ab70e7d..7aec427 100644 --- a/conda.spec +++ b/conda.spec @@ -1,7 +1,7 @@ %bcond_without tests Name: conda -Version: 23.1.0 +Version: 23.3.0 Release: %autorelease Summary: Cross-platform, Python-agnostic binary package manager @@ -86,6 +86,7 @@ BuildRequires: python%{python3_pkgversion}-cytoolz >= 0.8.2 # For tests BuildRequires: python-unversioned-command BuildRequires: python%{python3_pkgversion}-boto3 +BuildRequires: python%{python3_pkgversion}-jsonpatch BuildRequires: python%{python3_pkgversion}-pytest-mock BuildRequires: python%{python3_pkgversion}-pytest-rerunfailures BuildRequires: python%{python3_pkgversion}-pytest-timeout @@ -107,8 +108,9 @@ Provides: bundled(python%{python3_pkgversion}-boltons) = 18.0.0 %prep %autosetup -p1 +# Create version file +echo %{version} > conda/.version -sed -r -i 's/^(__version__ = ).*/\1"%{version}"/' conda/__init__.py # xdoctest not packaged sed -i -e '/xdoctest/d' setup.cfg diff --git a/sources b/sources index 60194c5..5b4c3e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (conda-23.1.0.tar.gz) = 43a9786efbee9d1de9f7b19b852a34d6bf120e3e93adf13ac67094b0f53b608fc52fd7d98c478af5e8d679d62bdd7acd339b07f0344b15507554c98eea86caff +SHA512 (conda-23.3.0.tar.gz) = 9c05a301c53cd246baa520411ec01f02f7556978910e7457c61cd0a876f6d411278f710bb677d4e665cdf245cc90e104f11b5826cfbb6401d2d1bf8f7ca0bbca