diff --git a/0001-add-setup-file.patch b/0001-add-setup-file.patch deleted file mode 100644 index 8e4425564f99896f6d473c96e3551dcee129f4f4..0000000000000000000000000000000000000000 --- a/0001-add-setup-file.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 | 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..3acc149 ---- /dev/null -+++ b/setup.py -@@ -0,0 +1,12 @@ -+#!/usr/bin/env python -+ -+from setuptools import setup -+ -+entry_points = \ -+ {'console_scripts': ['jaraco.collections = jaraco.collections:main']} -+ -+setup( -+ name='jaraco.collections', -+ version='3.8.0', -+ py_modules=['jaraco.collections'], -+) --- -2.30.0 - diff --git a/jaraco.collections-4.1.0.tar.gz b/jaraco.collections-4.1.0.tar.gz index 4ac15037f2df3dd354246082802af74c6480dc43..95d9f3480034de78a2d1cbd2835533997f4abe6b 100644 Binary files a/jaraco.collections-4.1.0.tar.gz and b/jaraco.collections-4.1.0.tar.gz differ diff --git a/python-jaraco-collections.spec b/python-jaraco-collections.spec index 4a6f0cecf360e532d70a4f4fea2ec0ce8bc87486..cf24487d4757a4777f1f01bb5133cfe875ccd186 100644 --- a/python-jaraco-collections.spec +++ b/python-jaraco-collections.spec @@ -1,12 +1,11 @@ %global _empty_manifest_terminate_build 0 Name: python-jaraco-collections Version: 4.1.0 -Release: 1 +Release: 2 Summary: Collection objects similar to those in stdlib by jaraco License: MIT URL: https://github.com/jaraco/jaraco.collections -Source0: https://github.com/jaraco/jaraco.collections/archive/refs/tags/v%{version}.tar.gz#/jaraco.collections-%{version}.tar.gz -Patch0: 0001-add-setup-file.patch +SOurce0: https://files.pythonhosted.org/packages/source/j/jaraco.collections/jaraco.collections-%{version}.tar.gz BuildArch: noarch Requires: python3-sphinx @@ -26,6 +25,7 @@ Summary: Collection objects similar to those in stdlib by jaraco Provides: python-jaraco-collections = %{version}-%{release} BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: python3-pip python3-wheel python3-hatch-vcs %description -n python3-jaraco-collections A dictionary-like object that maps a range of values to a given value. @@ -39,10 +39,10 @@ A dictionary-like object that maps a range of values to a given value. %autosetup -n jaraco.collections-%{version} -p1 %build -%py3_build +%pyproject_build %install -%py3_install +%pyproject_install jaraco.collections==%{version} install -d -m755 %{buildroot}/%{_pkgdocdir} if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi @@ -70,12 +70,15 @@ mv %{buildroot}/filelist.lst . mv %{buildroot}/doclist.lst . %files -n python3-jaraco-collections -f filelist.lst -%dir %{python3_sitelib}/* +%{python3_sitelib}/* %files help -f doclist.lst %{_docdir}/* %changelog +* Tue Apr 25 2023 yaoxin - 4.1.0-2 +- Modify the package compilation method and remove the adaptation to setup.py + * Mon Apr 10 2023 jiangxinyu - 4.1.0-1 - Update package to version 4.1.0