From c08dcf38b9acb4ad5cfed4731d767f8c9cd72cfb Mon Sep 17 00:00:00 2001
From: Charalampos Stratakis <cstratak@redhat.com>
Date: Apr 15 2020 17:45:27 +0000
Subject: Update to 1.12 (#1785781)


---

diff --git a/.gitignore b/.gitignore
index c4b7365..b12b7a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /axtls-43a6e6bd3bbc03dc501e16b89fba0ef042ed3ea0.tar.gz
 /v1.10.tar.gz
 /v1.11.tar.gz
+/v1.12.tar.gz
diff --git a/3e558300669effa93e5e4dad4c8c4ecc167766c4.patch b/3e558300669effa93e5e4dad4c8c4ecc167766c4.patch
deleted file mode 100644
index 33871cb..0000000
--- a/3e558300669effa93e5e4dad4c8c4ecc167766c4.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3e558300669effa93e5e4dad4c8c4ecc167766c4 Mon Sep 17 00:00:00 2001
-From: Damien George <damien.p.george@gmail.com>
-Date: Wed, 17 Jul 2019 15:33:27 +1000
-Subject: [PATCH] tests/stress/recursive_iternext.py: Increase large depth to
- 5000.
-
-So it fails correctly on Linux with clang.
----
- tests/stress/recursive_iternext.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/stress/recursive_iternext.py b/tests/stress/recursive_iternext.py
-index edb5a843f2..bbc389e726 100644
---- a/tests/stress/recursive_iternext.py
-+++ b/tests/stress/recursive_iternext.py
-@@ -14,7 +14,7 @@
- try:
-     # large stack/heap, eg unix
-     [0] * 80000
--    N = 2400
-+    N = 5000
- except:
-     try:
-         # medium, eg pyboard
diff --git a/micropython.spec b/micropython.spec
index e3240e9..3d59cb4 100644
--- a/micropython.spec
+++ b/micropython.spec
@@ -3,8 +3,8 @@
 
 
 Name:           micropython
-Version:        1.11
-Release:        3%{?dist}
+Version:        1.12
+Release:        1%{?dist}
 Summary:        Implementation of Python 3 with very low memory footprint
 
 # micorpython itself is MIT
@@ -20,10 +20,6 @@ Source1:       https://github.com/pfalcon/axtls/archive/%{axtls_commit}/axtls-%{
 %global berkley_commit 35aaec4418ad78628a3b935885dd189d41ce779b
 Source2:       https://github.com/pfalcon/berkeley-db-1.xx/archive/%{berkley_commit}/berkeley-db-1.xx-%{berkley_commit}.tar.gz
 
-# tests/stress/recursive_iternext.py: Increase large depth to 5000
-# upstream added this for clang, but it fixes a test failure with gcc 10 as well
-Patch1:        https://github.com/micropython/micropython/commit/3e558300669effa93e5e4dad4c8c4ecc167766c4.patch
-
 # Other arches need active porting
 ExclusiveArch:  %{arm} %{ix86} x86_64
 
@@ -45,7 +41,7 @@ BuildRequires:  openssl-devel
 # Normal %%{__pytohn3} is used anywhere else.
 # There is no runtime dependency on this CPython (or any other).
 # This is fixed upstream now, but we keep the macros for future use
-%global cpython_version_tests 3.7
+%global cpython_version_tests 3.8
 BuildRequires:  %{_bindir}/python%{cpython_version_tests}
 
 Provides:       bundled(axtls)
@@ -77,15 +73,15 @@ pathfix.py -i %{__python3} -p $files
 # Removing pre-built binary; not required for build
 rm ports/cc3200/bootmgr/relocator/relocator.bin
 
-# https://github.com/micropython/micropython/issues/4457
-sed -i -e '/^int __GI_vsnprintf/d' lib/utils/printf.c
+%build
+# Build the cross-compiler
+%make_build -C mpy-cross
 
+# Build the unbundled submodules
+%make_build -C ports/unix axtls V=1
 
-%build
-pushd ports/unix
-make axtls V=1 %{?_smp_mflags}
-make PYTHON=%{__python3} V=1 %{?_smp_mflags}
-popd
+# Build the interpreter
+%make_build -C ports/unix PYTHON=%{__python3} V=1
 
 execstack -c ports/unix/micropython
 
@@ -105,6 +101,9 @@ install -pm 755 ports/unix/micropython %{buildroot}%{_bindir}
 %{_bindir}/micropython
 
 %changelog
+* Wed Apr 15 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.12-1
+- Update to 1.12 (#1785781)
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 9ee8bf0..2a26bd7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (v1.11.tar.gz) = 1d8a9e79690da3c92cf0a6bdc76d091321bf1ebc310d6f8dd11101a64861599b076cacb59489e3cf86f47cf4fe4331f16f6afd64a2f1cf0cbdf1ddb294b7623e
+SHA512 (v1.12.tar.gz) = 624688bdf658f63de2257eed7b903a2a1bebaf02436feed09e0893090f49052d0e1b3d55ee8128f5ea813586f5c1e3d6cce6a8230be7fdb418509bb3b734b5ca
 SHA512 (axtls-43a6e6bd3bbc03dc501e16b89fba0ef042ed3ea0.tar.gz) = e6f049cc9966660ffc927c520a82af2e348aca6feadda98f5768102ee14577757e9c70111a345a5480658b5b8f4be51ed2e674ded08d243bc1f82f4107bc36e8
 SHA512 (berkeley-db-1.xx-35aaec4418ad78628a3b935885dd189d41ce779b.tar.gz) = 0d46237be7eb9db2819364405ddb03499c7b371d75cffe5004b1fa7870353a56fc9dc3101f2fd6856760f041f2353844b316dc79cc6b8037ef8188b2f07bff36