.gitignore

@@ -1 +1 @@
-SOURCES/docutils-0.16.tar.gz
+SOURCES/docutils-0.20.1.tar.gz

.python-docutils.metadata

@@ -1 +1 @@
-89cc4c2e81f7fc907359b9fa71f78117cde90ed1 SOURCES/docutils-0.16.tar.gz
+6e53dd117d09e6cd5d8596bf99a0dcbb202b8aad SOURCES/docutils-0.20.1.tar.gz

SPECS/python-docutils.spec

@@ -1,19 +1,20 @@
-%global srcname docutils
-
-Name:           python-%{srcname}
-Version:        0.16
-Release:        6%{?dist}
+Name:           python-docutils
+Version:        0.20.1
+Release:        5%{?dist}
 Summary:        System for processing plaintext documentation
 
 # See COPYING.txt for information
-License:        Public Domain and BSD and Python and GPLv3+
-URL:            http://docutils.sourceforge.net
-Source0:        https://sourceforge.net/projects/%{srcname}/files/%{srcname}/%{version}/%{srcname}-%{version}.tar.gz
+# PSF-2.0 was chosen for the SPDX identifier as it's the spirit of the original
+# author's notice, even though the shipped license text is copied from Python 2.1.1
+# See: https://gitlab.com/fedora/legal/fedora-license-data/-/issues/216
+License:        LicenseRef-Fedora-Public-Domain AND BSD-2-Clause AND BSD-3-Clause AND PSF-2.0 AND GPL-3.0-or-later
+URL:            https://docutils.sourceforge.net
+Source0:        https://sourceforge.net/projects/docutils/files/docutils/%{version}/docutils-%{version}.tar.gz
 
 BuildArch:      noarch
 
+BuildRequires:  pyproject-rpm-macros
 BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-setuptools
 
 %global _description %{expand:
 The Docutils project specifies a plaintext markup language, reStructuredText,
@@ -29,66 +30,111 @@ Python inline documentation modules and packages.}
 %description %_description
 
 
-%package -n python%{python3_pkgversion}-%{srcname}
+%package -n python%{python3_pkgversion}-docutils
 Summary:        %{summary}
 
-%description -n python%{python3_pkgversion}-%{srcname} %_description
+%description -n python%{python3_pkgversion}-docutils %_description
 
 
 %prep
-%autosetup -n %{srcname}-%{version}
+%autosetup -p1 -n docutils-%{version}
 
 # Remove shebang from library files
-sed -i -e '/#! *\/usr\/bin\/.*/{1D}' $(grep -Erl '^#!.+python' %{srcname})
-
-iconv -f ISO88592 -t UTF8 tools/editors/emacs/IDEAS.rst > tmp
-mv tmp tools/editors/emacs/IDEAS.rst
+sed -i -e '/#! *\/usr\/bin\/.*/{1D}' $(grep -Erl '^#!.+python' docutils)
 
 # We want the licenses but don't need this build file
 rm -f licenses/docutils.conf
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1687377
-rm test/test_writers/test_odt.py
+
+%generate_buildrequires
+%pyproject_buildrequires -r
 
 
 %build
-%py3_build
+%pyproject_wheel
 
 
 %install
-%py3_install
-mv docs/user/rst/images/biohazard.swf ./biohazard.swf
+%pyproject_install
+%pyproject_save_files docutils
 
-# docutils setup.py runs 2to3 on a copy of the tests and puts it in sitelib.
-rm -rf %{buildroot}%{python3_sitelib}/test
-
-for file in %{buildroot}/%{_bindir}/*.py; do
-  mv $file `dirname $file`/`basename $file .py`
+for file in %{buildroot}%{_bindir}/*.py; do
+  mv $file $(dirname $file)/$(basename $file .py)
 done
 
 
 %check
-mv  biohazard.swf docs/user/rst/images/biohazard.swf
+export PYTHONPATH=%{buildroot}%{python3_sitelib}
 %{python3} test/alltests.py
-rm docs/user/rst/images/biohazard.swf
 
 
-%files -n python%{python3_pkgversion}-%{srcname}
+%files -n python%{python3_pkgversion}-docutils -f %{pyproject_files}
 %license COPYING.txt licenses/*
-%doc BUGS.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt
-%doc THANKS.txt docs tools/editors
-%{python3_sitelib}/%{srcname}/
-%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/
+%doc BUGS.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt THANKS.txt
 %{_bindir}/rst*
+%{_bindir}/docutils
 
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.16-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.20.1-5
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.20.1-4
+- Bump release for June 2024 mass rebuild
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Aug 11 2023 Karolina Surma <ksurma@redhat.com> - 0.20.1-1
+- Update to 0.20.1
+Resolves: rhbz#2207802
+
+* Wed Aug 09 2023 Karolina Surma <ksurma@redhat.com> - 0.19-5
+- Declare the license as an SPDX expression
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.19-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 0.19-3
+- Rebuilt for Python 3.12
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Oct 24 2022 Karolina Surma <ksurma@redhat.com> - 0.19-1
+- Update to 0.19
+Resolves: rhbz#2099884
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.18.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jun 21 2022 Karolina Surma <ksurma@redhat.com> - 0.18.1-1
+- Update to 0.18.1
+Resolves: rhbz#2011077
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.17.1-3
+- Rebuilt for Python 3.11
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Sep 17 2021 Karolina Surma <ksurma@redhat.com> - 0.17.1-1
+- Update to 0.17.1
+Resolves: rhbz#1927513
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16-7
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 22 2021 Miro Hrončok <mhroncok@redhat.com> - 0.16-6
+- Stop shipping the entire docs sources, reduce the package size significantly
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.16-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 0.16-5
+- Rebuilt for Python 3.10
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild