From f6ea2fe026830e5120faf10e932f6691e3b2ad88 Mon Sep 17 00:00:00 2001 From: Julien Enselme Date: Dec 20 2022 12:24:45 +0000 Subject: Remove dependency to distutil. --- diff --git a/python-dbf.spec b/python-dbf.spec index 507ac18..53f43a6 100644 --- a/python-dbf.spec +++ b/python-dbf.spec @@ -9,13 +9,14 @@ fields are supported. Name: python-%{pypi_name} Version: 0.99.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} License: BSD URL: https://pypi.python.org/pypi/%{pypi_name} Source0: https://pypi.python.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz Patch0: prevent-synthax-error.patch +Patch1: remove-distutil.patch BuildArch: noarch @@ -35,7 +36,10 @@ Requires: python3-aenum %prep %setup -qn %{pypi_name}-%{version} -%autopatch -p1 +%patch0 -p1 +# Do the patch manually: we need --ignore-whitespace for the patch to be applied, +# but it doesn't work with %patch or %autopatch. +patch -p1 --ignore-whitespace remove-distutil.patch rm -rf *.egg-info rm -f dbf/ver_32.py rm -f dbf/ver_2.py @@ -56,6 +60,9 @@ sed -i "s|\r||g" dbf/README.md %{python3_sitelib}/%{pypi_name}/ %changelog +* Tue Dec 20 2022 Julien Enselme - 0.99.2-4 +- Remove dependency to distutil. + * Fri Jul 22 2022 Fedora Release Engineering - 0.99.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/remove-distutil.patch b/remove-distutil.patch new file mode 100644 index 0000000..f23cbf6 --- /dev/null +++ b/remove-distutil.patch @@ -0,0 +1,17 @@ +--- a/setup.py 2022-05-09 20:49:00.000000000 +0200 ++++ b/setup.py 2022-12-20 12:50:55.750112172 +0100 +@@ -3,7 +3,6 @@ + setuptools + except ImportError: + pass +-from distutils.core import setup + + #html_docs = glob('dbf/html/*') + +@@ -56,5 +55,5 @@ + ) + + if __name__ == '__main__': +- setup(**data) ++ setuptools.setup(**data) +