diff --git a/0001-add-setup-file.patch b/0001-add-setup-file.patch index 112ef8d..8e44255 100644 --- a/0001-add-setup-file.patch +++ b/0001-add-setup-file.patch @@ -1,25 +1,31 @@ -From 8b3c24a28145a3664b3ff3230c5a271b9157bd17 Mon Sep 17 00:00:00 2001 -From: liqiuyu123 -Date: Tue, 30 Aug 2022 11:29:14 +0800 -Subject: [PATCH] add setup file +From c85a3a7ff77ee156fcd0f2de1ecd7a56c0f0afae Mon Sep 17 00:00:00 2001 +From: starlet-dx <15929766099@163.com> +Date: Tue, 28 Feb 2023 10:32:16 +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..3acc149 --- /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.collections = jaraco.collections:main']} ++ ++setup( ++ name='jaraco.collections', ++ version='3.8.0', ++ py_modules=['jaraco.collections'], ++) -- -2.37.1.windows.1 +2.30.0 diff --git a/python-jaraco-collections.spec b/python-jaraco-collections.spec index b9a32f9..11d0e8d 100644 --- a/python-jaraco-collections.spec +++ b/python-jaraco-collections.spec @@ -1,7 +1,7 @@ %global _empty_manifest_terminate_build 0 Name: python-jaraco-collections Version: 3.8.0 -Release: 1 +Release: 2 Summary: Collection objects similar to those in stdlib by jaraco License: MIT URL: https://github.com/jaraco/jaraco.collections @@ -36,8 +36,7 @@ Provides: python3-jaraco-collections-doc A dictionary-like object that maps a range of values to a given value. %prep -%autosetup -n jaraco.collections-%{version} -%patch0 +%autosetup -n jaraco.collections-%{version} -p1 %build %py3_build @@ -77,6 +76,9 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Tue Feb 28 2023 yaoxin - 3.8.0-2 +- Adaptation to setup.py and modify the patching mode to resolve installation conflicts + * Fri Dec 16 2022 lijian - 3.8.0-1 - update to upstream version 3.8.0