From 7810299c77824c220c43d7b0c730197e2d9e47eb Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Thu, 5 Jan 2023 12:29:57 +0100
Subject: [PATCH] Update to 8.8.0 (rhbz#2158352)

---
 fix_entry_points.patch | 39 ---------------------------------------
 ipython.spec           | 12 ++++++------
 sources                |  2 +-
 3 files changed, 7 insertions(+), 46 deletions(-)
 delete mode 100644 fix_entry_points.patch

diff --git a/fix_entry_points.patch b/fix_entry_points.patch
deleted file mode 100644
index f80ec82..0000000
--- a/fix_entry_points.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c8d7e1ff6504515c11d4bc0d34011773472927e2 Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Wed, 30 Nov 2022 23:07:23 +0100
-Subject: [PATCH] fix entry points
-
----
- setup.cfg | 3 +++
- setup.py  | 1 -
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/setup.cfg b/setup.cfg
-index 9e6753e..1d87cbb 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -106,6 +106,9 @@ IPython.lib.tests = *.wav
- IPython.testing.plugin = *.txt
- 
- [options.entry_points]
-+console_scripts =
-+    ipython = IPython:start_ipython
-+    ipython3 = IPython:start_ipython
- pygments.lexers = 
- 	ipythonconsole = IPython.lib.lexers:IPythonConsoleLexer
- 	ipython = IPython.lib.lexers:IPythonLexer
-diff --git a/setup.py b/setup.py
-index 4939ca5..1ca6d98 100644
---- a/setup.py
-+++ b/setup.py
-@@ -139,7 +139,6 @@ setup_args['cmdclass'] = {
-     'install_scripts_sym': install_scripts_for_symlink,
-     'unsymlink': unsymlink,
- }
--setup_args["entry_points"] = {"console_scripts": find_entry_points()}
- 
- #---------------------------------------------------------------------------
- # Do the actual setup now
--- 
-2.38.1
-
diff --git a/ipython.spec b/ipython.spec
index 49f5fe3..0f86cb8 100644
--- a/ipython.spec
+++ b/ipython.spec
@@ -13,8 +13,8 @@
 %endif
 
 Name:           ipython
-Version:        8.7.0
-Release:        2%{?dist}
+Version:        8.8.0
+Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
 # See bug #603178 for a quick overview for the choice of licenses
@@ -23,7 +23,6 @@ Summary:        An enhanced interactive Python shell
 License:        (BSD and MIT and Python) and GPLv2+
 URL:            http://ipython.org/
 Source0:        %pypi_source
-Patch0:         fix_entry_points.patch
 Patch1:         relax-pytest-version-requirement.patch
 
 BuildArch:      noarch
@@ -165,9 +164,6 @@ This package contains the documentation of %{name}.
 %prep
 %autosetup -p1
 
-# use setuptools to have RPM generated requires
-sed -i 's/from distutils.core import setup/from setuptools import setup/' setup.py
-
 # delete bundling libs
 pushd IPython/external
 ls -l
@@ -227,6 +223,7 @@ rm -r %{buildroot}%{python3_sitelib}/IPython/*/tests
 %{python3_sitelib}/IPython/external
 %{python3_sitelib}/IPython/__pycache__/
 %{python3_sitelib}/IPython/*.py*
+%{python3_sitelib}/IPython/py.typed
 %dir %{python3_sitelib}/IPython/testing
 %{python3_sitelib}/IPython/testing/__pycache__/
 %{python3_sitelib}/IPython/testing/*.py*
@@ -259,6 +256,9 @@ rm -r %{buildroot}%{python3_sitelib}/IPython/*/tests
 
 
 %changelog
+* Thu Jan 05 2023 Lumír Balhar <lbalhar@redhat.com> - 8.8.0-1
+- Update to 8.8.0 (rhbz#2158352)
+
 * Wed Dec  7 2022 Mattias Ellert <mattias.ellert@physics.uu.se> - 8.7.0-2
 - Rename tests subpackage to fix auto provides
 
diff --git a/sources b/sources
index 5d73cd4..ea01e28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ipython-8.7.0.tar.gz) = 4652d06d1a0cf33a2b55f640d6bcc3fd9f1f644c848e869bc3807da8f4166060798ea5629fa80cc98a4a79b8ea1cde6013507eae859354a5db270b7fb3cca6bf
+SHA512 (ipython-8.8.0.tar.gz) = 18e8eaa285fe6278a27ffd2edcf4eccf629e05a8718faa721013d0433822ff8b850a2060135f26b5254a96b7ae0139e2ff4338676c08d3271a12c1b91532d7d1