diff --git a/.gitignore b/.gitignore index c3b5399..638d635 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/Markdown-2.6.11.tar.gz +Markdown-3.5.1.tar.gz diff --git a/.python-markdown.metadata b/.python-markdown.metadata deleted file mode 100644 index c220980..0000000 --- a/.python-markdown.metadata +++ /dev/null @@ -1 +0,0 @@ -4fb4cb6c46eac3dea20d38f9df70f375f73bdd2e SOURCES/Markdown-2.6.11.tar.gz diff --git a/SPECS/python-markdown.spec b/python-markdown.spec similarity index 52% rename from SPECS/python-markdown.spec rename to python-markdown.spec index 0ec3f7c..0bea5b3 100644 --- a/SPECS/python-markdown.spec +++ b/python-markdown.spec @@ -1,176 +1,214 @@ -%if 0%{?fedora} || 0%{?rhel} >= 7 -%bcond_without python3 -%else -%bcond_with python3 -%endif - -%if 0%{?rhel} > 7 -# Disable python2 build by default -%bcond_with python2 -%else -%bcond_without python2 -%endif - %global srcname Markdown %global pkgname markdown Name: python-%{pkgname} -Version: 2.6.11 -Release: 2%{?dist} +Version: 3.5.1 +Release: 6%{?dist} Summary: Markdown implementation in Python -License: BSD +License: BSD-3-Clause URL: https://python-markdown.github.io/ -Source0: https://files.pythonhosted.org/packages/source/M/%{srcname}/%{srcname}-%{version}.tar.gz +Source0: %{pypi_source} BuildArch: noarch - - -%description -This is a Python implementation of John Gruber's Markdown. It is -almost completely compliant with the reference implementation, though -there are a few known issues. - -%if %{with python2} -%package -n python2-%{pkgname} -Summary: Markdown implementation in Python -BuildRequires: python2-devel -BuildRequires: python2-nose -%if ! 0%{?rhel} -BuildRequires: python2-yaml -%else -BuildRequires: python-yaml +BuildRequires: python3-devel +BuildRequires: python3-PyYAML +%if ( 0%{?rhel} && 0%{?rhel} <= 9 ) +BuildRequires: python3-importlib-metadata >= 4.4 +Requires: python3-importlib-metadata >= 4.4 %endif -%{?python_provide:%python_provide python2-%{pkgname}} -%description -n python2-%{pkgname} -This is a Python implementation of John Gruber's Markdown. It is +%global _description %{expand: +This is a Python implementation of John Gruber’s Markdown. It is almost completely compliant with the reference implementation, though -there are a few known issues. -%endif # with python2 +there are a few very minor differences.} + +%description %_description -%if %{with python3} -%package -n python%{python3_pkgversion}-%{pkgname} -Summary: Markdown implementation in Python -BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-nose -BuildRequires: python%{python3_pkgversion}-PyYAML -%{?python_provide:%python_provide python%{python3_pkgversion}-%{pkgname}} +%package -n python3-%{pkgname} +Summary: %{summary} -%description -n python%{python3_pkgversion}-%{pkgname} -This is a Python implementation of John Gruber's Markdown. It is -almost completely compliant with the reference implementation, though -there are a few known issues. -%endif # with python3 +%description -n python3-%{pkgname} %_description %prep -%setup -qc -n %{srcname}-%{version} -%if %{with python2} -cp -a %{srcname}-%{version} python2 -%endif # with python2 +%autosetup -p1 -n %{srcname}-%{version} -%if %{with python3} -cp -a %{srcname}-%{version} python3 -%endif # with python3 +%generate_buildrequires +%pyproject_buildrequires %build -%if %{with python2} -pushd python2 -%py2_build -popd -%endif # with python2 - -%if %{with python3} -pushd python3 -%py3_build -popd -%endif # with python3 +%pyproject_wheel %install -%if %{with python2} -pushd python2 -%py2_install - -# rename binary -mv %{buildroot}%{_bindir}/markdown_py{,-%{python2_version}} -ln -s markdown_py-%{python2_version} %{buildroot}%{_bindir}/markdown_py-2 - -# process license file -PYTHONPATH=%{buildroot}%{python2_sitelib} \ - %{buildroot}%{_bindir}/markdown_py-%{python2_version} \ - LICENSE.md > LICENSE.html -popd -%endif # with python2 - -%if %{with python3} -pushd python3 -%py3_install - -# rename binary -mv %{buildroot}%{_bindir}/markdown_py{,-%{python3_version}} -ln -s markdown_py-%{python3_version} %{buildroot}%{_bindir}/markdown_py-3 +%pyproject_install +%pyproject_save_files %{pkgname} # process license file PYTHONPATH=%{buildroot}%{python3_sitelib} \ - %{buildroot}%{_bindir}/markdown_py-%{python3_version} \ + %{buildroot}%{_bindir}/markdown_py \ LICENSE.md > LICENSE.html -popd -%endif # with python3 - -%if %{without python3} -ln -s markdown_py-%{python2_version} %{buildroot}%{_bindir}/markdown_py -%else -ln -s markdown_py-%{python3_version} %{buildroot}%{_bindir}/markdown_py -%endif # without python3 %check -%if %{with python2} -pushd python2 -%{__python2} run-tests.py -popd -%endif # with python2 - -%if %{with python3} -pushd python3 -%{__python3} run-tests.py -popd -%endif # with python3 +%python3 -m unittest discover tests -%if %{with python2} -%files -n python2-%{pkgname} -# temporarily skip packaging docs - see also -# https://github.com/Python-Markdown/markdown/issues/621 -#doc python2/build/docs/* -%license python2/LICENSE.* -%{python2_sitelib}/* -%if %{without python3} -%{_bindir}/markdown_py -%endif # without python3 -%{_bindir}/markdown_py-2 -%{_bindir}/markdown_py-%{python2_version} -%endif # with python2 - - -%if %{with python3} -%files -n python%{python3_pkgversion}-%{pkgname} +%files -n python3-%{pkgname} -f %{pyproject_files} # temporarily skip packaging docs - see also # https://github.com/Python-Markdown/markdown/issues/621 #doc python3/build/docs/* -%license python3/LICENSE.* -%{python3_sitelib}/* +%license LICENSE.html LICENSE.md %{_bindir}/markdown_py -%{_bindir}/markdown_py-3 -%{_bindir}/markdown_py-%{python3_version} -%endif # with python3 %changelog -* Thu Jun 14 2018 Charalampos Stratakis - 2.6.11-2 -- Conditionalize the python2 subpackage +* Tue Oct 29 2024 Troy Dawson - 3.5.1-6 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Aug 19 2024 Tomas Popela - 3.5.1-5 +- Move to SDPX license format + +* Mon Jun 24 2024 Troy Dawson - 3.5.1-4 +- Bump release for June 2024 mass rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 3.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 3.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Nov 4 2023 Thomas Moschny - 3.5.1-1 +- Update to 3.5.1. + +* Sun Oct 22 2023 Thomas Moschny - 3.5-1 +- Update to 3.5. + +* Sun Jul 30 2023 Thomas Moschny - 3.4.4-1 +- Update to 3.4.4. +- Update packaging. + +* Fri Jul 21 2023 Fedora Release Engineering - 3.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 3.4.1-3 +- Rebuilt for Python 3.12 + +* Fri Jan 20 2023 Fedora Release Engineering - 3.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 29 2022 Sandro Mani - 3.4.1-1 +- Update to 3.4.1 + +* Fri Jul 22 2022 Fedora Release Engineering - 3.3.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 3.3.7-2 +- Rebuilt for Python 3.11 + +* Sat May 28 2022 Thomas Moschny - 3.3.7-1 +- Update to 3.3.7. + +* Fri Jan 21 2022 Fedora Release Engineering - 3.3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sun Dec 5 2021 Thomas Moschny - 3.3.6-2 +- Update requirements for Python < 3.10. + +* Sat Nov 27 2021 Thomas Moschny - 3.3.6-1 +- Update to 3.3.6. + +* Sat Nov 27 2021 Thomas Moschny - 3.3.5-1 +- Update to 3.3.5. + +* Fri Jul 23 2021 Fedora Release Engineering - 3.3.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 02 2021 Python Maint - 3.3.4-3 +- Rebuilt for Python 3.10 + +* Sat Feb 27 2021 Thomas Moschny - 3.3.4-2 +- Apply PR6 by Igor Raits : Support + for building on EPEL8 + upstream tests invocation. +- Remove unused BR on python3-tidy (we'd need pytidylib instead, which + doesn't seem to be packaged). + +* Sat Feb 27 2021 Thomas Moschny - 3.3.4-1 +- Update to 3.3.4. + +* Wed Jan 27 2021 Fedora Release Engineering - 3.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Oct 25 2020 Thomas Moschny - 3.3.3-1 +- Update to 3.3.3. + +* Sun Oct 25 2020 Thomas Moschny - 3.3.2-1 +- Update to 3.3.2. + +* Tue Oct 13 2020 Thomas Moschny - 3.3.1-1 +- Update to 3.3.1. + +* Wed Jul 29 2020 Fedora Release Engineering - 3.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri May 22 2020 Miro Hrončok - 3.2.2-3 +- Rebuilt for Python 3.9 + +* Sat May 16 2020 Thomas Moschny - 3.2.2-2 +- Update BRs. + +* Sat May 16 2020 Thomas Moschny - 3.2.2-1 +- Update to 3.2.2. + +* Sat Feb 22 2020 Thomas Moschny - 3.2.1-1 +- Update to 3.2.1. + +* Thu Jan 30 2020 Fedora Release Engineering - 3.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 3.1.1-6 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Thu Aug 15 2019 Miro Hrončok - 3.1.1-5 +- Rebuilt for Python 3.8 + +* Tue Aug 13 2019 Thomas Moschny - 3.1.1-4 +- Drop versioned binaries. + +* Tue Aug 13 2019 Gwyn Ciesla - 3.1.1-3 +- Drop Python 2. + +* Fri Jul 26 2019 Fedora Release Engineering - 3.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat May 25 2019 Thomas Moschny - 3.1.1-1 +- Update to 3.1.1. + +* Fri May 03 2019 Miro Hrončok - 3.1-2 +- Move /usr/bin/markdown_py to python3-markdown (#1705777) + +* Tue Mar 26 2019 Thomas Moschny - 3.1-1 +- Update to 3.1. + +* Mon Mar 25 2019 Thomas Moschny - 3.0.1-1 +- Update to 3.0.1. +- Simplify spec file. +- CLI tool uses Python3 now. +- Update BRs. + +* Sat Feb 02 2019 Fedora Release Engineering - 2.6.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.6.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Jun 17 2018 Miro Hrončok - 2.6.11-3 +- Rebuilt for Python 3.7 + +* Sun Jun 3 2018 Thomas Moschny - 2.6.11-2 +- Try to fix a FTBFS with Python 3.7 (rhbz#1583678). * Sun Feb 11 2018 Thomas Moschny - 2.6.11-1 - Update to 2.6.11. diff --git a/sources b/sources new file mode 100644 index 0000000..b8d2ad2 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (Markdown-3.5.1.tar.gz) = 72771300bded3a12b0f1addfcdb124c8e12d3b42672c62b92b7565a03d8ba108fe9d156a59c1783295059a11e6e2d312ec4f60de2bc6c0ee7b853c0a56e2e97c