From eebbf2b2562a26e760bd645513febb4d1253e5a5 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Thu, 2 Jul 2020 15:38:42 -0600
Subject: [PATCH] Version 1.6.1.  Drop upstreamed -ast patch.

---
 sources         |  2 +-
 sympy-ast.patch | 38 --------------------------------------
 sympy.spec      | 11 ++++++-----
 3 files changed, 7 insertions(+), 44 deletions(-)
 delete mode 100644 sympy-ast.patch

diff --git a/sources b/sources
index b38d2fa..581479a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sympy-1.6.tar.gz) = d3fa69deb27d70be476c2be45f8cd58f2951bfa8adba5f62810ccce36a26d0380b1b8f4eac3d1f28056f415b2b66ef2bcbe752a29e7cd8913feff19443ceddba
+SHA512 (sympy-1.6.1.tar.gz) = 95630b6fad1e41f2d58d1f4f4433ef76d4553f3e119bfdd36048c5880ac7f07d572e901eaae0b5c6208f598989a86ab5e03932a851f8048c584154973be6982c
diff --git a/sympy-ast.patch b/sympy-ast.patch
deleted file mode 100644
index d9de64a..0000000
--- a/sympy-ast.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- sympy-sympy-1.6/sympy/parsing/sympy_parser.py.orig	2020-05-22 19:34:58.000000000 -0600
-+++ sympy-sympy-1.6/sympy/parsing/sympy_parser.py	2020-06-24 09:39:41.248164173 -0600
-@@ -1058,7 +1058,7 @@ class EvaluateFalseTransformer(ast.NodeT
-                 right = ast.Call(
-                     func=ast.Name(id='Mul', ctx=ast.Load()),
-                     args=[ast.UnaryOp(op=ast.USub(), operand=ast.Num(1)), right],
--                    keywords=[ast.keyword(arg='evaluate', value=ast.Name(id='False', ctx=ast.Load()))],
-+                    keywords=[ast.keyword(arg='evaluate', value=ast.Constant(value=False))],
-                     starargs=None,
-                     kwargs=None
-                 )
-@@ -1069,7 +1069,7 @@ class EvaluateFalseTransformer(ast.NodeT
-                     left = ast.Call(
-                     func=ast.Name(id='Pow', ctx=ast.Load()),
-                     args=[left, ast.UnaryOp(op=ast.USub(), operand=ast.Num(1))],
--                    keywords=[ast.keyword(arg='evaluate', value=ast.Name(id='False', ctx=ast.Load()))],
-+                    keywords=[ast.keyword(arg='evaluate', value=ast.Constant(value=False))],
-                     starargs=None,
-                     kwargs=None
-                 )
-@@ -1077,7 +1077,7 @@ class EvaluateFalseTransformer(ast.NodeT
-                     right = ast.Call(
-                     func=ast.Name(id='Pow', ctx=ast.Load()),
-                     args=[right, ast.UnaryOp(op=ast.USub(), operand=ast.Num(1))],
--                    keywords=[ast.keyword(arg='evaluate', value=ast.Name(id='False', ctx=ast.Load()))],
-+                    keywords=[ast.keyword(arg='evaluate', value=ast.Constant(value=False))],
-                     starargs=None,
-                     kwargs=None
-                 )
-@@ -1085,7 +1085,7 @@ class EvaluateFalseTransformer(ast.NodeT
-             new_node = ast.Call(
-                 func=ast.Name(id=sympy_class, ctx=ast.Load()),
-                 args=[left, right],
--                keywords=[ast.keyword(arg='evaluate', value=ast.Name(id='False', ctx=ast.Load()))],
-+                keywords=[ast.keyword(arg='evaluate', value=ast.Constant(value=False))],
-                 starargs=None,
-                 kwargs=None
-             )
diff --git a/sympy.spec b/sympy.spec
index 7856ab5..149fbb7 100644
--- a/sympy.spec
+++ b/sympy.spec
@@ -1,6 +1,6 @@
 Name:           sympy
-Version:        1.6
-Release:        2%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 Summary:        A Python library for symbolic mathematics
 License:        BSD
 URL:            http://sympy.org/
@@ -9,9 +9,6 @@ Source0:        https://github.com/%{name}/%{name}/archive/%{name}-%{version}.ta
 Patch0:         %{name}-float.patch
 # Default to python3 in the Cython backend
 Patch1:         %{name}-python3.patch
-# Adapt to AST changes in python 3.9
-# See https://github.com/sympy/sympy/issues/19638
-Patch2:         %{name}-ast.patch
 
 BuildArch:      noarch
 
@@ -177,6 +174,10 @@ fi
 %{_docdir}/%{name}-doc/html
 
 %changelog
+* Thu Jul  2 2020 Jerry James <loganjerry@gmail.com> - 1.6.1-1
+- Version 1.6.1
+- Drop upstreamed -ast patch
+
 * Wed Jun 24 2020 Jerry James <loganjerry@gmail.com> - 1.6-2
 - Add setuptools BR
 - Add -ast patch to fix compilation with python 3.9