From b36d999059ce7502fb9359a64b44e94fc1875168 Mon Sep 17 00:00:00 2001
From: starlet-dx <15929766099@163.com>
Date: Mon, 27 Feb 2023 17:13:48 +0800
Subject: [PATCH] Adaptation to setup.py and modify the patching mode to
 resolve installation conflicts

(cherry picked from commit 6c6973d782d48ce79893f76387fba84877c61556)
---
 0001-add-setup.py.patch    | 30 ++++++++++++++++++------------
 python-jaraco-classes.spec | 15 +++++++--------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/0001-add-setup.py.patch b/0001-add-setup.py.patch
index 7ad928d..ad911c4 100644
--- a/0001-add-setup.py.patch
+++ b/0001-add-setup.py.patch
@@ -1,25 +1,31 @@
-From 442decd2a4c9b754e8c674044b85016d4fa99a7d Mon Sep 17 00:00:00 2001
-From: Gzx1999 <guozhengxin@kylinos.cn>
-Date: Sat, 24 Sep 2022 19:45:06 +0800
-Subject: [PATCH] add setup.py
+From bfed6fe2faa3df27b50c0b8efe9a3274207c82ad Mon Sep 17 00:00:00 2001
+From: starlet-dx <15929766099@163.com>
+Date: Tue, 28 Feb 2023 10:54:01 +0800
+Subject: [PATCH 1/1] add setup file
 
 ---
- setup.py | 6 ++++++
- 1 file changed, 6 insertions(+)
+ setup.py | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
  create mode 100644 setup.py
 
 diff --git a/setup.py b/setup.py
 new file mode 100644
-index 0000000..bac24a4
+index 0000000..f2daeed
 --- /dev/null
 +++ b/setup.py
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,12 @@
 +#!/usr/bin/env python
 +
-+import setuptools
++from setuptools import setup
 +
-+if __name__ == "__main__":
-+    setuptools.setup()
++entry_points = \
++        {'console_scripts': ['jaraco.classes = jaraco.classes:main']}
++
++setup(
++    name='jaraco.classes',
++    version='3.2.3',
++    py_modules=['jaraco.classes'],
++)
 -- 
-2.25.1
+2.30.0
 
diff --git a/python-jaraco-classes.spec b/python-jaraco-classes.spec
index 94fb735..3664a46 100644
--- a/python-jaraco-classes.spec
+++ b/python-jaraco-classes.spec
@@ -1,7 +1,7 @@
 %global _empty_manifest_terminate_build 0
 Name:		python-jaraco-classes
 Version:	3.2.3
-Release:	2
+Release:	3
 Summary:	Utility functions for Python class constructs
 License:	MIT
 URL:		https://github.com/jaraco/jaraco.classes
@@ -43,8 +43,7 @@ Provides:	python3-jaraco-classes-doc
 Documentation for jaraco-classes
 
 %prep
-%autosetup -n jaraco.classes-%{version}
-%patch0
+%autosetup -n jaraco.classes-%{version} -p1
 
 %build
 %py3_build
@@ -77,16 +76,16 @@ popd
 mv %{buildroot}/filelist.lst .
 mv %{buildroot}/doclist.lst .
 
-%files -n python3-jaraco-classes
-%{python3_sitelib}/b*
-%exclude %{python3_sitelib}/b/__pycache__/
-%{python3_sitelib}/jaraco/classes
-%{python3_sitelib}/jaraco.classes-*-py%{python3_version}.egg-info/
+%files -n python3-jaraco-classes -f filelist.lst
+%dir %{python3_sitelib}/*
 
 %files help -f doclist.lst
 %{_docdir}/*
 
 %changelog
+* Mon Feb 27 2023 yaoxin <yaoxin30@h-partners.com> - 3.2.3-3
+- Adaptation to setup.py and modify the patching mode to resolve installation conflicts
+
 * Fri Feb 24 2023 yaoxin <yaoxin30@h-partners.com> - 3.2.3-2
 - Fix installation conflicts between python3-jaraco-classes and python-jaraco-collections