diff --git a/0001-Use-main-entry-point-for-conda-and-re-add-conda-env-.patch b/0001-Use-main-entry-point-for-conda-and-re-add-conda-env-.patch
new file mode 100644
index 0000000..c655aa9
--- /dev/null
+++ b/0001-Use-main-entry-point-for-conda-and-re-add-conda-env-.patch
@@ -0,0 +1,27 @@
+From b5f226ef5dd81dec3b01f58e22c252a27a84e515 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Sun, 8 Oct 2023 19:51:26 -0600
+Subject: [PATCH] Use main entry point for conda and re-add conda-env entry
+ point, no need to run conda init
+
+---
+ pyproject.toml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 2c897d3..1abe369 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -49,7 +49,8 @@ documentation = "https://docs.conda.io/projects/conda/en/stable/"
+ repository = "https://github.com/conda/conda"
+ 
+ [project.scripts]
+-conda = "conda.cli.main_pip:main"
++conda = "conda.cli.main:main"
++conda-env = "conda_env.cli.main:main"
+ 
+ [tool.hatch.version]
+ source = "vcs"
+-- 
+2.42.0
+
diff --git a/0002-Use-main-entry-point-for-conda-and-re-add-conda-env-.patch b/0002-Use-main-entry-point-for-conda-and-re-add-conda-env-.patch
deleted file mode 100644
index 3d3d298..0000000
--- a/0002-Use-main-entry-point-for-conda-and-re-add-conda-env-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f8f9a23a2a7540ec39cab9606f8b95aa8b346b65 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Mon, 24 Nov 2025 17:30:20 -0700
-Subject: [PATCH 2/2] Use main entry point for conda and re-add conda-env entry
-
----
- pyproject.toml | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 7c8f24f..049859b 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -51,7 +51,8 @@ readme = "README.md"
- requires-python = ">=3.10"
- 
- [project.scripts]
--conda = "conda.cli.main_pip:main"
-+conda = "conda.cli.main:main"
-+conda-env = "conda_env.cli.main:main"
- 
- [project.urls]
- changelog = "https://github.com/conda/conda/blob/main/CHANGELOG.md"
--- 
-2.51.1
-
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 f747eb0..197eb23 100644
--- a/0004-Do-not-try-to-run-usr-bin-python.patch
+++ b/0004-Do-not-try-to-run-usr-bin-python.patch
@@ -1,15 +1,16 @@
-diff -up conda-24.9.1/conda/common/path/python.py.python conda-24.9.1/conda/common/path/python.py
---- conda-24.9.1/conda/common/path/python.py.python	2024-10-01 15:11:32.000000000 -0600
-+++ conda-24.9.1/conda/common/path/python.py	2024-10-07 21:43:44.951895698 -0600
-@@ -5,6 +5,7 @@
- from __future__ import annotations
- 
+diff --git a/conda/common/path.py b/conda/common/path.py
+index 32ed396..76bc20a 100644
+--- a/conda/common/path.py
++++ b/conda/common/path.py
+@@ -5,6 +5,7 @@ from __future__ import annotations
+ import os
  import re
+ import subprocess
 +import sys
+ from functools import lru_cache, reduce
+ from itertools import accumulate, chain
  from logging import getLogger
- from os.path import join, split, splitext
- 
-@@ -52,9 +53,11 @@ def parse_entry_point_def(ep_definition)
+@@ -175,9 +176,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/0006-shell-assume-shell-plugins-are-in-etc.patch b/0006-shell-assume-shell-plugins-are-in-etc.patch
index 68c60df..b7710f9 100644
--- a/0006-shell-assume-shell-plugins-are-in-etc.patch
+++ b/0006-shell-assume-shell-plugins-are-in-etc.patch
@@ -1,51 +1,51 @@
 diff --git a/conda/activate.py b/conda/activate.py
-index f79a03f..951bed4 100644
+index 8149162..0d751e3 100644
 --- a/conda/activate.py
 +++ b/conda/activate.py
-@@ -914,13 +914,7 @@ class PosixActivator(_Activator):
+@@ -918,13 +918,7 @@ class PosixActivator(_Activator):
      set_var_tmpl = "%s='%s'"
-     run_script_tmpl = ". \"`cygpath '%s'`\"" if on_win else '. "%s"'
+     run_script_tmpl = '. "%s"'
  
--    hook_source_path = Path(
+-    hook_source_path = join(
 -        CONDA_PACKAGE_ROOT,
 -        "shell",
 -        "etc",
 -        "profile.d",
 -        "conda.sh",
 -    )
-+    hook_source_path = Path("/etc/profile.d/conda.sh")
-     inline_hook_source = True
++    hook_source_path = '/etc/profile.d/conda.sh'
  
      def _update_prompt(self, set_vars, conda_prompt_modifier):
-@@ -956,13 +950,7 @@ class CshActivator(_Activator):
+         ps1 = self.environ.get("PS1", "")
+@@ -971,13 +965,7 @@ class CshActivator(_Activator):
      set_var_tmpl = "set %s='%s'"
-     run_script_tmpl = "source \"`cygpath '%s'`\"" if on_win else 'source "%s"'
+     run_script_tmpl = 'source "%s"'
  
--    hook_source_path = Path(
+-    hook_source_path = join(
 -        CONDA_PACKAGE_ROOT,
 -        "shell",
 -        "etc",
 -        "profile.d",
 -        "conda.csh",
 -    )
-+    hook_source_path = Path("/etc/profile.d/conda.csh")
-     # TCSH/CSH removes newlines when doing command substitution (see `man tcsh`),
-     # source conda.csh directly and use line terminators to separate commands
-     inline_hook_source = False
-@@ -1001,7 +989,7 @@ class XonshActivator(_Activator):
++    hook_source_path = '/etc/profile.d/conda.csh'
+ 
+     def _update_prompt(self, set_vars, conda_prompt_modifier):
+         prompt = self.environ.get("prompt", "")
+@@ -1033,7 +1021,7 @@ class XonshActivator(_Activator):
          else 'source-bash --suppress-skip-message -n "%s"'
      )
  
--    hook_source_path = Path(CONDA_PACKAGE_ROOT, "shell", "conda.xsh")
-+    hook_source_path = Path("/etc/profile.d/conda.xsh")
-     inline_hook_source = True
+-    hook_source_path = join(CONDA_PACKAGE_ROOT, "shell", "conda.xsh")
++    hook_source_path = "/etc/profile.d/conda.xsh"
  
-     def template_path_var(self, key: str, value: str) -> str:
-@@ -1055,14 +1043,7 @@ class FishActivator(_Activator):
+     def _hook_preamble(self) -> str:
+         return '$CONDA_EXE = "%s"' % self.path_conversion(context.conda_exe)
+@@ -1074,14 +1062,7 @@ class FishActivator(_Activator):
      set_var_tmpl = 'set -g %s "%s"'
      run_script_tmpl = 'source "%s"'
  
--    hook_source_path = Path(
+-    hook_source_path = join(
 -        CONDA_PACKAGE_ROOT,
 -        "shell",
 -        "etc",
@@ -53,20 +53,20 @@ index f79a03f..951bed4 100644
 -        "conf.d",
 -        "conda.fish",
 -    )
-+    hook_source_path = Path("/etc/fish/conf.d/conda.fish")
-     inline_hook_source = True
- 
++    hook_source_path = "/etc/fish/conf.d/conda.fish"
  
+     def _hook_preamble(self) -> str:
+         if on_win:
 diff --git a/conda/base/context.py b/conda/base/context.py
-index adf6d6e..612ea4a 100644
+index c22fafd..cf29eb6 100644
 --- a/conda/base/context.py
 +++ b/conda/base/context.py
-@@ -848,7 +848,7 @@ class Context(Configuration):
-     def av_data_dir(self) -> PathType:
+@@ -739,7 +739,7 @@ class Context(Configuration):
+     def av_data_dir(self):
          """Where critical artifact verification data (e.g., various public keys) can be found."""
          # TODO (AV): Find ways to make this user configurable?
 -        return join(self.conda_prefix, "etc", "conda")
 +        return '/etc/conda'
  
      @property
-     def signing_metadata_url_base(self) -> str | None:
+     def signing_metadata_url_base(self):
diff --git a/conda-32bit.patch b/conda-32bit.patch
new file mode 100644
index 0000000..19fa4d3
--- /dev/null
+++ b/conda-32bit.patch
@@ -0,0 +1,21 @@
+diff --git a/tests/core/test_solve.py b/tests/core/test_solve.py
+index 71812ca..778bbb4 100644
+--- a/tests/core/test_solve.py
++++ b/tests/core/test_solve.py
+@@ -224,14 +224,14 @@ def test_cuda_fail_1(tmpdir, clear_cuda_version):
+         else:
+             plat = "osx-64"
+     elif sys.platform == "linux":
+-        plat = "linux-64"
++        plat = "linux-%s" % platform.architecture()[0][0:2]
+     elif sys.platform == "win32":
+         if platform.architecture()[0] == "32bit":
+             plat = "win-32"
+         else:
+             plat = "win-64"
+     else:
+-        plat = "linux-64"
++        plat = "linux-%s" % platform.architecture()[0][0:2]
+ 
+     assert str(exc.value).strip() == dals(
+         """The following specifications were found to be incompatible with your system:
diff --git a/conda-cpuinfo.patch b/conda-cpuinfo.patch
new file mode 100644
index 0000000..d395727
--- /dev/null
+++ b/conda-cpuinfo.patch
@@ -0,0 +1,26 @@
+diff --git a/conda/base/context.py b/conda/base/context.py
+index dbeac32..8b78e69 100644
+--- a/conda/base/context.py
++++ b/conda/base/context.py
+@@ -1864,7 +1864,7 @@ conda_tests_ctxt_mgmt_def_pol = replace_context_default
+ @lru_cache(maxsize=None)
+ def _get_cpu_info():
+     # DANGER: This is rather slow
+-    from .._vendor.cpuinfo import get_cpu_info
++    from cpuinfo import get_cpu_info
+ 
+     return frozendict(get_cpu_info())
+ 
+diff --git a/tests/core/test_solve.py b/tests/core/test_solve.py
+index efb839a..71812ca 100644
+--- a/tests/core/test_solve.py
++++ b/tests/core/test_solve.py
+@@ -8,7 +8,7 @@ from unittest.mock import Mock
+ 
+ import pytest
+ 
+-from conda._vendor.cpuinfo import get_cpu_info
++from cpuinfo import get_cpu_info
+ from conda.auxlib.ish import dals
+ from conda.base.context import conda_tests_ctxt_mgmt_def_pol, context
+ from conda.common.compat import on_linux
diff --git a/conda.spec b/conda.spec
index 5e7e2c3..29d07b3 100644
--- a/conda.spec
+++ b/conda.spec
@@ -1,7 +1,7 @@
 %bcond_without tests
 
 Name:           conda
-Version:        25.11.1
+Version:        23.9.0
 Release:        %autorelease
 Summary:        Cross-platform, Python-agnostic binary package manager
 
@@ -13,9 +13,14 @@ URL:            http://conda.pydata.org/docs/
 Source0:        https://github.com/conda/conda/archive/%{version}/%{name}-%{version}.tar.gz
 # bash completion script moved to a separate project
 Source1:        https://raw.githubusercontent.com/tartansandal/conda-bash-completion/1.7/conda
-Patch0:         0001-conda_sys_prefix.patch.patch
+Patch0:         conda_sys_prefix.patch
 # Use main entry point for conda and re-add conda-env entry point, no need to run conda init
-Patch1:         0002-Use-main-entry-point-for-conda-and-re-add-conda-env-.patch
+Patch1:         0001-Use-main-entry-point-for-conda-and-re-add-conda-env-.patch
+# Use system cpuinfo
+Patch3:         conda-cpuinfo.patch
+# Fix tests on 32bit
+# https://github.com/conda/conda/pull/9759
+Patch4:         conda-32bit.patch
 
 Patch10004:     0004-Do-not-try-to-run-usr-bin-python.patch
 Patch10005:     0005-Fix-failing-tests-in-test_api.py.patch
@@ -26,13 +31,13 @@ BuildArch:      noarch
 BuildRequires:  pkgconfig(bash-completion)
 %global bash_completionsdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo '/etc/bash_completion.d')
 BuildRequires:  sed
-# For man pages
-BuildRequires:  python-conda-sphinx-theme
 
 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
 
+%?python_enable_dependency_generator
+
 
 %global _description %{expand:
 Conda is a cross-platform, Python-agnostic binary package manager. It
@@ -63,37 +68,54 @@ Summary:        %{summary}
 BuildRequires:  python%{python3_pkgversion}-devel
 # For tests
 BuildRequires:  python-unversioned-command
-BuildRequires:  python%{python3_pkgversion}-boltons
 BuildRequires:  python%{python3_pkgversion}-boto3
-BuildRequires:  python%{python3_pkgversion}-conda-libmamba-solver
 BuildRequires:  python%{python3_pkgversion}-flask
 BuildRequires:  python%{python3_pkgversion}-jsonpatch
-BuildRequires:  python%{python3_pkgversion}-libmambapy
-BuildRequires:  python%{python3_pkgversion}-pexpect
 BuildRequires:  python%{python3_pkgversion}-pytest-mock
 BuildRequires:  python%{python3_pkgversion}-pytest-rerunfailures
-BuildRequires:  python%{python3_pkgversion}-pytest-split
 BuildRequires:  python%{python3_pkgversion}-pytest-timeout
 BuildRequires:  python%{python3_pkgversion}-pytest-xprocess
 BuildRequires:  python%{python3_pkgversion}-responses
 
-# conda uses a modified version of auxlib
+# Some versions in conda/_vendor/vendor.txt
+Provides:       bundled(python%{python3_pkgversion}-appdirs) = 1.2.0
 Provides:       bundled(python%{python3_pkgversion}-auxlib) = 0.0.43
+Provides:       bundled(python%{python3_pkgversion}-boltons) = 21.0.0
+
+%{?python_provide:%python_provide python%{python3_pkgversion}-conda}
 
 %description -n python%{python3_pkgversion}-conda %_description
 
 %prep
 %autosetup -p1
 
-# Re-enable dep on conda-libmamba-solver
-sed -i -e '/"conda-libmamba-solver/s/# *//' pyproject.toml
-
 # Do not restrict upper bound of ruamel-yaml
 sed -i -e '/ruamel.yaml/s/,<[0-9.]*//' pyproject.toml
 
+# F38 has an older jsonpatch
+sed -i -e '/jsonpatch/d' pyproject.toml
+
 # pytest-split/xdoctest not packaged, store-duration not needed
 sed -i -e '/splitting-algorithm/d' -e '/store-durations/d' -e '/xdoctest/d' pyproject.toml
 
+# delete interpreter line, the user can always call the file
+# explicitly as python3 /usr/lib/python3.6/site-packages/conda/_vendor/appdirs.py
+# or so.
+sed -r -i '1 {/#![/]usr[/]bin[/]env/d}' conda/_vendor/appdirs.py
+
+# Use Fedora's cpuinfo since it supports more arches
+rm -r conda/_vendor/cpuinfo
+sed -i -e '/^dependencies = /a\ \ "py-cpuinfo",' pyproject.toml
+
+# Use system versions
+rm -r conda/_vendor/{distro.py,frozendict}
+find conda -name \*.py | xargs sed -i -e 's/^\( *\)from .*_vendor\.\(\(distro\|frozendict\).*\) import/\1from \2 import/'
+sed -i -e '/^dependencies = /a\ \ "distro",' pyproject.toml
+sed -i -e '/^dependencies = /a\ \ "frozendict",' pyproject.toml
+
+# Unpackaged - use vendored version
+sed -i -e '/"boltons *>/d' pyproject.toml
+
 # Unpackaged - really only applicable for macOS/Windows?
 sed -i -e '/"truststore *>/d' pyproject.toml
 
@@ -110,24 +132,19 @@ sed -i -e s/linux-64/%{python3_platform}/ tests/data/conda_format_repo/%{python3
 sed -i -e '/"--cov/d' pyproject.toml
 
 %generate_buildrequires
-# When not testing, we don't need runtime dependencies.
-# Normally, we would still BuildRequire them to not accidentally build an uninstallable package,
-# but there is a runtime dependency loop with python3-conda-libmamba-solver.
-%pyproject_buildrequires %{!?with_tests:-R}
+%pyproject_buildrequires
 
 %build
 %pyproject_wheel
 
 %install
 %pyproject_install
-#py3_shebang_fix %{buildroot}%{python3_sitelib}/conda/shell/bin/conda
+%py3_shebang_fix %{buildroot}%{python3_sitelib}/conda/shell/bin/conda
 %pyproject_save_files conda*
 
 mkdir -p %{buildroot}%{_sysconfdir}/conda/condarc.d
 mkdir -p %{buildroot}%{_datadir}/conda/condarc.d
 cat >%{buildroot}%{_datadir}/conda/condarc.d/defaults.yaml <<EOF
-channels:
- - https://conda.anaconda.org/conda-forge
 pkgs_dirs:
  - /var/cache/conda/pkgs
  - ~/.conda/pkgs
@@ -144,9 +161,9 @@ sed -r -i -e '1i [ -z "$CONDA_EXE" ] && CONDA_EXE=%{_bindir}/conda' \
           -e '/PATH=.*condabin/s|PATH=|[ -d $(dirname "$CONDA_EXE")/condabin ] \&\& PATH=|' %{buildroot}/etc/profile.d/conda.sh
 sed -r -i -e '1i set _CONDA_EXE=%{_bindir}/conda\nset _CONDA_ROOT=' \
           -e 's/CONDA_PFX=.*/CONDA_PFX=/' %{buildroot}/etc/profile.d/conda.csh
-install -m 0644 -Dt %{buildroot}%{_datadir}/fish/vendor_conf.d/ conda/shell/etc/fish/conf.d/conda.fish
+install -m 0644 -Dt %{buildroot}/etc/fish/conf.d/ conda/shell/etc/fish/conf.d/conda.fish
 sed -r -i -e '1i set -gx CONDA_EXE "/usr/bin/conda"\nset _CONDA_ROOT "/usr"\nset _CONDA_EXE "/usr/bin/conda"\nset -gx CONDA_PYTHON_EXE "/usr/bin/python3"' \
-          %{buildroot}%{_datadir}/fish/vendor_conf.d/conda.fish
+          %{buildroot}/etc/fish/conf.d/conda.fish
 
 # Install bash completion script
 install -m 0644 -Dt %{buildroot}%{bash_completionsdir}/ %SOURCE1
@@ -164,199 +181,41 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
 # test_cli.py::TestRun.test_run_returns_int
 # test_cli.py::TestRun.test_run_returns_nonzero_errorlevel
 # test_cli.py::TestRun.test_run_returns_zero_errorlevel
+
 # test_ProgressiveFetchExtract_prefers_conda_v2_format, test_subdir_data_prefers_conda_to_tar_bz2,
 # test_use_only_tar_bz2 fail in F31 koji, but not with mock --enablerepo=local. Let's disable
 # them for now.
-# tests/base/test_context.py::test_default_activation_prefix - conda.exceptions.CondaHTTPError
-# tests/cli/test_all_commands.py::test_denylist_channels - conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
-# tests/cli/test_cli_install.py::test_frozen_env_cep22[libmamba] - conda.exceptions.CondaHTTPError
-# tests/cli/test_cli_install.py::test_frozen_env_cep22[classic] - conda.exceptions.CondaHTTPError
-# Unsure - but perhaps config does not has a subdir?
-# tests/cli/test_common.py::test_validate_subdir_config - TypeError: expected str, bytes or os.PathLike object, not NoneType
-# tests/cli/test_common.py::test_validate_subdir_config_invalid_subdir - TypeError: argument should be a str or an os.PathLike object where __fspath__ returns a str, not 'NoneType'
-# Would need an installed conda to test
-# tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[bash-expected_patterns0] - FileNotFoundError: [Errno 2] No such file or directory: '/etc/profile.d/conda.sh'
-# tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[zsh-expected_patterns1] - FileNotFoundError: [Errno 2] No such file or directory: '/etc/profile.d/conda.sh'
-# tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[fish-expected_patterns2] - FileNotFoundError: [Errno 2] No such file or directory: '/etc/fish/conf.d/conda.fish'
-# tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[xonsh-expected_patterns5] - FileNotFoundError: [Errno 2] No such file or directory: '/etc/profile.d/conda.xsh'
-# tests/cli/test_main_export.py::test_export_preserves_channels_from_installed_packages - AssertionError: Expected to find conda-forge or defaults in channels: ['https://conda.anaconda.org/conda-forge']
-# tests/cli/test_main_export.py::test_export_package_alphabetical_ordering - AssertionError: Should have multiple packages for ordering test
-# tests/cli/test_main_export.py::test_export_no_builds_format - AssertionError: Should have conda packages to test
-# tests/cli/test_main_export.py::test_export_regular_format_consistency - AssertionError: Should have conda packages to test
-# tests/cli/test_main_export.py::test_export_pip_dependencies_handling[environment-yaml-yaml_safe_load] - AssertionError: Should have conda dependencies
-# tests/cli/test_main_export.py::test_export_pip_dependencies_handling[environment-json-loads] - AssertionError: Should have conda dependencies
-# tests/cli/test_main_export.py::test_export_with_pip_dependencies_integration[YAML--yaml_safe_load] - conda.exceptions.CondaHTTPError
-# tests/cli/test_main_export.py::test_export_with_pip_dependencies_integration[JSON---format=json-loads] - conda.exceptions.CondaHTTPError
-# tests/cli/test_main_export.py::test_export_explicit_format_validation_errors - conda.exceptions.CondaHTTPError
-# tests/cli/test_main_export.py::test_export_multiple_platforms - conda.exceptions.CondaHTTPError
-# tests/cli/test_main_export.py::test_export_single_platform_different_platform - conda.exceptions.CondaHTTPError
-# The /usr base env does not have last_modified
-# tests/cli/test_main_info.py::test_info_json - AssertionError: assert False
-# tests/cli/test_main_install.py::test_build_version_shows_as_changed - conda.exceptions.CondaHTTPError
-# tests/cli/test_main_list.py::test_fields_all - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
-# tests/cli/test_main_list.py::test_fields_invalid - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
-# tests/cli/test_main_list.py::test_exit_codes - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
-# tests/cli/test_main_update.py::test_update - conda.exceptions.CondaHTTPError
-# tests/cli/test_main_update.py::test_dont_update_packages_with_version_constraints - conda.exceptions.NoBaseEnvironmentError: This conda installation has no default base environment. Use
-# tests/core/test_prefix_data.py::test_get_packages_behavior_with_interoperability - conda.exceptions.CondaHTTPError
-# tests/core/test_prefix_data.py::test_empty_environment_package_methods - conda.exceptions.CondaHTTPError
-# tests/core/test_prefix_data.py::test_pinned_specs_conda_meta_pinned - conda.exceptions.CondaHTTPError
-# tests/core/test_solve.py::test_pinned_specs_conda_meta_pinned[libmamba] - conda.exceptions.CondaHTTPError
-# tests/core/test_solve.py::test_pinned_specs_condarc[libmamba] - conda.exceptions.CondaHTTPError
-# tests/core/test_solve.py::test_pinned_specs_all[libmamba] - conda.exceptions.CondaHTTPError
-# These are HTTP errors
-# tests/env/installers/test_conda_installer_explicit.py::test_installer_installs_explicit - conda.CondaMultiError
-# tests/env/specs/test_explicit.py::test_environment - conda.CondaMultiError
-# tests/env/test_create.py::test_create_env_from_non_existent_plugin - conda.exceptions.CondaHTTPError
-# tests/models/test_environment.py::test_extrapolate - conda.exceptions.CondaHTTPError
-# tests/models/test_environment.py::test_explicit_packages - conda.CondaMultiError
-# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check[-\u2705] - conda.exceptions.CondaHTTPError
-# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check[conda 1.11-\u2705] - conda.exceptions.CondaHTTPError
-# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check[conda 1.11, otherpackages==1-\u274c] - conda.exceptions.CondaHTTPError
-# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check["conda"-\u274c] - conda.exceptions.CondaHTTPError
-# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check[imnotinstalledyet-\u274c] - conda.exceptions.CondaHTTPError
-# tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_supported[True] - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
-# tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_supported[False] - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
-# tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_not_supported - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
-# tests/plugins/test_transaction_hooks.py::test_transaction_hooks_invoked - conda.exceptions.CondaHTTPError
-# These are network errors
-# tests/plugins/test_transaction_hooks.py::test_pre_transaction_raises_exception - AssertionError: Regex pattern did not match.
-# tests/plugins/test_transaction_hooks.py::test_post_transaction_raises_exception - AssertionError: Regex pattern did not match.
+# tests/conda_env/test_create.py::test_create_update_remote_env_file requires network access
 # tests/cli/test_conda_argparse.py::test_list_through_python_api does not recognize /usr as a conda environment
-# tests/cli/test_main_{clean,info,install,list,list_reverse,rename}.py tests require network access
+# tests/cli/test_main_{clean,info,list,list_reverse,rename}.py tests require network access
 # tests/cli/test_main_notices.py::test_notices_appear_once_when_running_decorated_commands needs a conda_build fixture that we remove
 # tests/cli/test_main_notices.py::test_notices_cannot_read_cache_files - TypeError: '<' not supported between instances of 'MagicMock' and 'int'
 # tests/cli/test_main_run.py require /usr/bin/conda to be installed
 # tests/cli/test_subcommands.py tests require network access
-# tests/cli/test_subcommands.py::test_doctor- conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
 # tests/cli/test_subcommands.py::test_rename seems to need an active environment
-# tests/env/test_create.py::test_create_env_json requires network access
-# tests/env/test_create.py::test_create_update_remote_env_file requires network access
-# tests/env/test_create.py::test_protected_dirs_error_for_env_create - requires network access
-# tests/test_activate.py::test_activate_same_environment - requries network
-# tests/test_activate.py::test_build_activate_dont_activate_unset_var - requires network
-# tests/test_activate.py::test_build_activate_restore_unset_env_vars - requries network
-# tests/test_activate.py::test_build_activate_shlvl_warn_clobber_vars - requries network
-# tests/test_activate.py::test_build_activate_shlvl_0 - requries network
-# tests/test_activate.py::test_build_activate_shlvl_1 - requries network
-# tests/test_activate.py::test_build_deactivate_shlvl_2_from_stack - requries network
-# tests/test_activate.py::test_build_deactivate_shlvl_2_from_activate - requries network
-# tests/test_activate.py::test_build_deactivate_shlvl_1 - requries network
-# tests/test_activate.py::test_build_stack_shlvl_1 - requries network
-# tests/test_activate.py::test_get_env_vars_big_whitespace/test_get_env_vars_empty_file require network access
-# tests/test_activate.py::test_pre_post_command_invoked[hook] - requires conda to be installed
-# tests/test_activate.py::test_pre_post_command_raises[hook] - requires conda to be installed
 # tests/test_misc.py::test_explicit_missing_cache_entries requires network access
 # tests/core/test_initialize.py tries to unlink /usr/bin/python3 and fails when python is a release candidate
 # tests/core/test_solve.py::test_cuda_fail_1 fails on non-x86_64
-# tests/core/test_solve.py libmamba - some depsolving differences - TODO
-# tests/core/test_solve.py libmamba - some depsolving differences - TODO
-# tests/core/test_prefix_graph.py libmamba - some depsolving differences - TODO
-# tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_happy_path - conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
-# tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_happy_path_verbose - conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
-# tests/plugins/test_health_checks.py::test_health_check_ran - conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
-# tests/plugins/test_subcommands.py::test_help - Difference in whitespace
-# tests/testing/test_fixtures.py::test_tmp_env - requires network access
-# tests/testing/test_fixtures.py::test_session_tmp_env - requires network access
-# tests/testing/test_fixtures.py::test_env - requires network tests to succeed
-# tests/testing/test_fixtures.py::test_tmp_channel - requires network access
 # tests/trust/test_signature_verification.py requires conda_content_trust - not yet packaged
-py.test-%{python3_version} -vv -rfs -m "not integration" \
-    --deselect=tests/test_activate.py::test_activate_same_environment \
-    --deselect=tests/test_activate.py::test_build_activate_dont_activate_unset_var \
-    --deselect=tests/test_activate.py::test_build_activate_dont_use_PATH \
-    --deselect=tests/test_activate.py::test_build_activate_restore_unset_env_vars \
-    --deselect=tests/test_activate.py::test_build_activate_shlvl_warn_clobber_vars \
-    --deselect=tests/test_activate.py::test_build_activate_shlvl_0 \
-    --deselect=tests/test_activate.py::test_build_activate_shlvl_1 \
-    --deselect=tests/test_activate.py::test_build_deactivate_dont_use_PATH \
-    --deselect=tests/test_activate.py::test_build_deactivate_shlvl_2_from_stack \
-    --deselect=tests/test_activate.py::test_build_deactivate_shlvl_2_from_activate \
-    --deselect=tests/test_activate.py::test_build_deactivate_shlvl_1 \
-    --deselect=tests/test_activate.py::test_build_stack_shlvl_1 \
-    --deselect=tests/test_activate.py::test_get_env_vars_big_whitespace \
-    --deselect=tests/test_activate.py::test_get_env_vars_empty_file \
-    --deselect=tests/test_activate.py::test_pre_post_command_invoked[hook] \
-    --deselect=tests/test_activate.py::test_pre_post_command_raises[hook] \
+py.test-%{python3_version} -vv -m "not integration" \
     --deselect=tests/test_cli.py::TestJson::test_list \
     --deselect=tests/test_cli.py::test_run_returns_int \
     --deselect=tests/test_cli.py::test_run_returns_nonzero_errorlevel \
     --deselect=tests/test_cli.py::test_run_returns_zero_errorlevel \
     --deselect=tests/test_cli.py::test_run_readonly_env \
-    --deselect=tests/test_install.py::test_conda_pip_interop_dependency_satisfied_by_pip \
-    --deselect=tests/test_install.py::test_install_from_extracted_package \
-    --deselect=tests/test_install.py::test_install_mkdir \
     --deselect=tests/test_misc.py::test_explicit_missing_cache_entries \
-    --ignore=tests/env/specs/test_binstar.py \
-    --deselect=tests/base/test_context.py::test_default_activation_prefix \
-    --deselect=tests/cli/test_cli_install.py::test_frozen_env_cep22[libmamba] \
-    --deselect=tests/cli/test_cli_install.py::test_frozen_env_cep22[classic] \
-    --deselect=tests/cli/test_common.py::test_validate_subdir_config \
-    --deselect=tests/cli/test_common.py::test_validate_subdir_config_invalid_subdir \
-    --deselect=tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[bash-expected_patterns0] \
-    --deselect=tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[zsh-expected_patterns1] \
-    --deselect=tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[fish-expected_patterns2] \
-    --deselect=tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[xonsh-expected_patterns5] \
-    --deselect=tests/cli/test_main_export.py::test_export_preserves_channels_from_installed_packages \
-    --deselect=tests/cli/test_main_export.py::test_export_package_alphabetical_ordering \
-    --deselect=tests/cli/test_main_export.py::test_export_no_builds_format \
-    --deselect=tests/cli/test_main_export.py::test_export_regular_format_consistency \
-    --deselect=tests/cli/test_main_export.py::test_export_pip_dependencies_handling[environment-yaml-yaml_safe_load] \
-    --deselect=tests/cli/test_main_export.py::test_export_pip_dependencies_handling[environment-json-loads] \
-    --deselect=tests/cli/test_main_export.py::test_export_with_pip_dependencies_integration[YAML--yaml_safe_load] \
-    --deselect=tests/cli/test_main_export.py::test_export_with_pip_dependencies_integration[JSON---format=json-loads] \
-    --deselect=tests/cli/test_main_export.py::test_export_explicit_format_validation_errors \
-    --deselect=tests/cli/test_main_export.py::test_export_multiple_platforms \
-    --deselect=tests/cli/test_main_export.py::test_export_single_platform_different_platform \
-    --deselect=tests/cli/test_main_install.py::test_build_version_shows_as_changed \
-    --deselect=tests/cli/test_main_list.py::test_fields_all \
-    --deselect=tests/cli/test_main_list.py::test_fields_invalid \
-    --deselect=tests/cli/test_main_list.py::test_exit_codes \
-    --deselect=tests/cli/test_main_update.py::test_update \
-    --deselect=tests/cli/test_main_update.py::test_dont_update_packages_with_version_constraints \
-    --deselect=tests/core/test_prefix_data.py::test_get_packages_behavior_with_interoperability \
-    --deselect=tests/core/test_prefix_data.py::test_empty_environment_package_methods \
-    --deselect=tests/core/test_prefix_data.py::test_pinned_specs_conda_meta_pinned \
-    --deselect=tests/core/test_prefix_data.py::test_unset_reserved_env_vars \
-    --deselect=tests/core/test_prefix_data.py::test_warn_setting_reserved_env_vars \
-    --deselect=tests/core/test_solve.py::test_pinned_specs_conda_meta_pinned[libmamba] \
-    --deselect=tests/core/test_solve.py::test_pinned_specs_condarc[libmamba] \
-    --deselect=tests/core/test_solve.py::test_pinned_specs_all[libmamba] \
-    --deselect=tests/env/installers/test_conda_installer_explicit.py::test_installer_installs_explicit \
-    --deselect=tests/env/specs/test_explicit.py::test_environment \
-    --deselect=tests/env/test_create.py::test_create_env_from_non_existent_plugin \
-    --deselect=tests/models/test_environment.py::test_extrapolate \
-    --deselect=tests/models/test_environment.py::test_explicit_packages \
-    --deselect=tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check \
-    --deselect=tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_supported[True] \
-    --deselect=tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_supported[False] \
-    --deselect=tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_not_supported \
-    --deselect=tests/plugins/test_transaction_hooks.py::test_transaction_hooks_invoked \
-    --deselect=tests/plugins/test_transaction_hooks.py::test_pre_transaction_raises_exception \
-    --deselect=tests/plugins/test_transaction_hooks.py::test_post_transaction_raises_exception \
-    --deselect=tests/cli/test_all_commands.py::test_denylist_channels \
+    --ignore=tests/conda_env/specs/test_binstar.py \
+    --deselect=tests/conda_env/test_create.py::test_create_update_remote_env_file \
     --deselect='tests/cli/test_common.py::test_is_active_prefix[active_prefix-True]' \
-    --deselect=tests/cli/test_config.py::test_conda_config_describe \
-    --deselect=tests/cli/test_config.py::test_conda_config_validate \
-    --deselect=tests/cli/test_config.py::test_conda_config_validate_sslverify_truststore \
     --deselect=tests/cli/test_conda_argparse.py::test_list_through_python_api \
     --deselect=tests/cli/test_main_clean.py \
-    --deselect=tests/cli/test_main_info.py::test_info_python_output \
     --deselect=tests/cli/test_main_info.py::test_info_conda_json \
-    --deselect=tests/cli/test_main_info.py::test_info_json \
-    --deselect=tests/cli/test_main_install.py::test_conda_pip_interop_dependency_satisfied_by_pip \
-    --deselect=tests/cli/test_main_install.py::test_install_from_extracted_package \
-    --deselect=tests/cli/test_main_install.py::test_install_mkdir \
     --deselect=tests/cli/test_main_list.py::test_list \
     --deselect=tests/cli/test_main_list.py::test_list_reverse \
     --deselect=tests/cli/test_main_notices.py::test_notices_appear_once_when_running_decorated_commands \
     --deselect=tests/cli/test_main_notices.py::test_notices_cannot_read_cache_files \
-    --deselect=tests/cli/test_main_remove.py::test_remove_all \
-    --deselect=tests/cli/test_main_remove.py::test_remove_all_keep_env \
     --deselect=tests/cli/test_main_rename.py \
     --deselect=tests/cli/test_main_run.py \
-    --deselect=tests/cli/test_subcommands.py::test_create[libmamba] \
-    --deselect=tests/cli/test_subcommands.py::test_doctor \
     --deselect=tests/cli/test_subcommands.py::test_env_create \
     --deselect=tests/cli/test_subcommands.py::test_env_update \
     --deselect=tests/cli/test_subcommands.py::test_init \
@@ -368,8 +227,6 @@ py.test-%{python3_version} -vv -rfs -m "not integration" \
     --deselect=tests/cli/test_subcommands.py::test_rename \
     --deselect=tests/cli/test_subcommands.py::test_run \
     --deselect=tests/cli/test_subcommands.py::test_search \
-    --deselect=tests/cli/test_subcommands.py::test_update[libmamba-update] \
-    --deselect=tests/cli/test_subcommands.py::test_update[libmamba-upgrade] \
     --deselect=tests/cli/test_subcommands.py::test_update[update] \
     --deselect=tests/cli/test_subcommands.py::test_update[upgrade] \
     --deselect=tests/core/test_package_cache_data.py::test_ProgressiveFetchExtract_prefers_conda_v2_format \
@@ -377,54 +234,7 @@ py.test-%{python3_version} -vv -rfs -m "not integration" \
     --deselect=tests/core/test_subdir_data.py::test_use_only_tar_bz2 \
     --deselect=tests/core/test_initialize.py \
     --deselect=tests/core/test_solve.py::test_cuda_fail_1 \
-    --deselect=tests/core/test_solve.py::test_conda_downgrade[libmamba] \
-    --deselect=tests/core/test_solve.py::test_python2_update[libmamba] \
-    --deselect=tests/core/test_solve.py::test_update_deps_2[libmamba] \
-    --deselect=tests/core/test_solve.py::test_fast_update_with_update_modifier_not_set[libmamba] \
-    --deselect=tests/core/test_solve.py::test_timestamps_1[libmamba] \
-    --deselect=tests/core/test_solve.py::test_remove_with_constrained_dependencies[libmamba] \
-    --deselect=tests/env/test_create.py::test_create_env_json[example/environment.yml] \
-    --deselect=tests/env/test_create.py::test_create_env_json[example/environment_with_pip.yml] \
-    --deselect=tests/env/test_create.py::test_create_update_remote_env_file \
-    --deselect=tests/env/test_create.py::test_protected_dirs_error_for_env_create \
     --deselect=tests/gateways/test_jlap.py::test_download_and_hash \
-    --deselect=tests/gateways/test_jlap.py::test_jlap_fetch_ssl[True] \
-    --deselect=tests/gateways/test_jlap.py::test_jlap_fetch_ssl[False] \
-    --deselect=tests/test_plan.py::test_pinned_specs_conda_meta_pinned \
-    --deselect=tests/test_plan.py::test_pinned_specs_condarc \
-    --deselect=tests/test_plan.py::test_pinned_specs_all \
-    --deselect=tests/cli/test_subcommands.py::test_compare[libmamba] \
-    --deselect=tests/cli/test_subcommands.py::test_package[libmamba] \
-    --deselect=tests/cli/test_subcommands.py::test_remove[libmamba-remove] \
-    --deselect=tests/cli/test_subcommands.py::test_remove[libmamba-uninstall] \
-    --deselect=tests/cli/test_subcommands.py::test_remove_all_json[libmamba-remove] \
-    --deselect=tests/cli/test_subcommands.py::test_remove_all_json[libmamba-uninstall] \
-    --deselect=tests/cli/test_subcommands.py::test_remove_all_json[classic-remove] \
-    --deselect=tests/cli/test_subcommands.py::test_remove_all_json[classic-uninstall] \
-    --deselect=tests/cli/test_subcommands.py::test_update[classic-update] \
-    --deselect=tests/cli/test_subcommands.py::test_update[classic-upgrade] \
-    --deselect=tests/cli/test_subcommands.py::test_env_remove[libmamba] \
-    --deselect=tests/cli/test_subcommands.py::test_env_config_vars[libmamba] \
-    --deselect=tests/core/test_subdir_data.py::test_subdir_data_coverage \
-    --deselect=tests/models/test_prefix_graph.py::test_prefix_graph_1[libmamba] \
-    --deselect=tests/models/test_prefix_graph.py::test_prefix_graph_2[libmamba] \
-    --deselect=tests/models/test_prefix_graph.py::test_remove_youngest_descendant_nodes_with_specs[libmamba] \
-    --deselect=tests/models/test_prefix_graph.py::test_deep_cyclical_dependency[libmamba] \
-    --deselect=tests/plugins/test_pre_solves.py::test_pre_solve_invoked \
-    --deselect=tests/plugins/test_post_solves.py::test_post_solve_action_raises_exception \
-    --deselect=tests/plugins/test_post_solves.py::test_post_solve_invoked \
-    --deselect=tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_happy_path \
-    --deselect=tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_happy_path_verbose \
-    --deselect=tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_with_test_environment \
-    --deselect=tests/plugins/test_health_checks.py::test_health_check_ran \
-    --deselect=tests/plugins/test_subcommands.py::test_help \
-    --deselect=tests/core/test_prefix_data.py::test_get_environment_env_vars \
-    --deselect=tests/core/test_prefix_data.py::test_set_unset_environment_env_vars \
-    --deselect=tests/core/test_prefix_data.py::test_set_unset_environment_env_vars_no_exist \
-    --deselect=tests/testing/test_fixtures.py::test_tmp_env \
-    --deselect=tests/testing/test_fixtures.py::test_session_tmp_env \
-    --deselect=tests/testing/test_fixtures.py::test_env \
-    --deselect=tests/testing/test_fixtures.py::test_tmp_channel \
     --ignore=tests/trust \
     conda tests
 %endif
@@ -434,9 +244,10 @@ py.test-%{python3_version} -vv -rfs -m "not integration" \
 %{_bindir}/conda
 %{_bindir}/conda-env
 %{bash_completionsdir}/conda
-# TODO - better ownership for fish/vendor_conf.d
-%dir %{_datadir}/fish/vendor_conf.d
-%{_datadir}/fish/vendor_conf.d/conda.fish
+# TODO - better ownership/requires for fish
+%dir /etc/fish
+%dir /etc/fish/conf.d
+/etc/fish/conf.d/conda.fish
 /etc/profile.d/conda.sh
 /etc/profile.d/conda.csh
 
diff --git a/0001-conda_sys_prefix.patch.patch b/conda_sys_prefix.patch
similarity index 51%
rename from 0001-conda_sys_prefix.patch.patch
rename to conda_sys_prefix.patch
index 6e2c646..5bf76b7 100644
--- a/0001-conda_sys_prefix.patch.patch
+++ b/conda_sys_prefix.patch
@@ -1,17 +1,8 @@
-From 7eeb6a32d2004bc20a156dd8920964c107e99321 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Tue, 30 Jul 2024 18:00:00 -0600
-Subject: [PATCH 1/2] conda_sys_prefix.patch
-
----
- conda/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 diff --git a/conda/__init__.py b/conda/__init__.py
-index 4245cae..a436b1d 100644
+index 923ccde..2b64a72 100644
 --- a/conda/__init__.py
 +++ b/conda/__init__.py
-@@ -54,7 +54,7 @@ __summary__ = __doc__
+@@ -28,7 +28,7 @@ __summary__ = __doc__
  __url__ = "https://github.com/conda/conda"
  
  if os.getenv("CONDA_ROOT") is None:
@@ -20,6 +11,3 @@ index 4245cae..a436b1d 100644
  
  #: The conda package directory.
  CONDA_PACKAGE_ROOT = abspath(dirname(__file__))
--- 
-2.45.2
-
diff --git a/sources b/sources
index 28be694..f3592f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (conda-25.11.1.tar.gz) = ce04c8805ca51047cf1e1ebb945fcce1fbb559fe472d4f5fb4217d49b93b67c8e38baf735c6a9244b31d559247ec10d46e1e33caf8ac7fedc105ce3645121609
+SHA512 (conda-23.9.0.tar.gz) = 2aaa5ba01f49f7ad5dc55e48bc4811a4f7e969ba67d075536e3822ddb2e4e481a32a78e9234112be5dcec0ec14b9090aea079dc48840aebb1e380a288413ac7a