From 3a9b9103ef12bdaa0be946f84016b9d0fb52c872 Mon Sep 17 00:00:00 2001 From: tzing_t Date: Thu, 10 Aug 2023 19:55:20 +0800 Subject: [PATCH] Fix conflict with python-bunch (cherry picked from commit 6d6d1db3825621329e7c10c52e181d74a3c2f49e) --- bunch.patch | 13 +++++++++++++ python-bunch.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 bunch.patch diff --git a/bunch.patch b/bunch.patch new file mode 100644 index 0000000..8bc9f65 --- /dev/null +++ b/bunch.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index b10f09e..278ee21 100644 +--- a/setup.py ++++ b/setup.py +@@ -8,7 +8,7 @@ from setuptools import setup + HERE = abspath(dirname(__file__)) + readme = open(join(HERE, 'README.rst')).read() + +-package_file = open(join(HERE, 'bunch/__init__.py'), 'rU') ++package_file = open(join(HERE, 'bunch/__init__.py'), 'r') + __version__ = re.sub( + r".*\b__version__\s+=\s+'([^']+)'.*", + r'\1', diff --git a/python-bunch.spec b/python-bunch.spec index ab77ade..823e3f9 100644 --- a/python-bunch.spec +++ b/python-bunch.spec @@ -1,11 +1,12 @@ %global _empty_manifest_terminate_build 0 Name: python-bunch Version: 1.0.1 -Release: 2 +Release: 3 Summary: A dot-accessible dictionary (a la JavaScript objects) License: MIT URL: http://github.com/dsc/bunch Source0: https://files.pythonhosted.org/packages/cc/56/ceef9c8c12600a1ceb3dcefdd9e5094c72fbdba0c3af785b4a69205022c1/bunch-1.0.1.zip +Patch001: bunch.patch BuildArch: noarch %description Bunch is a dictionary that supports attribute-style access, a la JavaScript. @@ -71,6 +72,9 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Thu Aug 10 2023 zhengting - 1.0.1-3 +- DESC: fix conflict with bunch + * Fri Jul 30 2021 chenyanpanHW - 1.0.1-2 - DESC: delete -S git from %autosetup -- Gitee