From 8619deb4ab36232328f2c458019d8466c4046045 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Aug 03 2019 12:03:24 +0000
Subject: Unbundle cpuinfo


---

diff --git a/0008-De-vendor-cpuinfo.patch b/0008-De-vendor-cpuinfo.patch
new file mode 100644
index 0000000..c0d0f4b
--- /dev/null
+++ b/0008-De-vendor-cpuinfo.patch
@@ -0,0 +1,22 @@
+From 228bbedbacc8ebd55a4fa820047b91209a127464 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Sat, 3 Aug 2019 13:57:33 +0200
+Subject: [PATCH] De-vendor cpuinfo
+
+---
+ conda/base/context.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/conda/base/context.py b/conda/base/context.py
+index 525b227692..10ba84c01a 100644
+--- a/conda/base/context.py
++++ b/conda/base/context.py
+@@ -1256,7 +1256,7 @@ conda_tests_ctxt_mgmt_def_pol = replace_context_default
+ @memoize
+ 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/conda.spec b/conda.spec
index 1ed04f9..cc92d45 100644
--- a/conda.spec
+++ b/conda.spec
@@ -25,6 +25,7 @@ Patch10003:     0003-Drop-fs-path-encoding-manipulation-under-python2.patch
 Patch10004:     0004-Do-not-try-to-run-usr-bin-python.patch
 Patch10005:     0005-Fix-failing-tests-in-test_api.py.patch
 Patch10006:     0006-shell-assume-shell-plugins-are-in-etc.patch
+Patch10008:     0008-De-vendor-cpuinfo.patch
 
 BuildArch:      noarch
 
@@ -50,7 +51,8 @@ entirely in Python.
         python2-pycosat >= 0.6.3 \
         python2-ruamel-yaml \
         python2-mock \
-        python2-responses
+        python2-responses \
+        python2-cpuinfo
 
 %global _py2_bund \
         bundled(python2-appdirs) = 1.2.0 \