Compare commits

...

No commits in common. "c8" and "c9" have entirely different histories.
c8 ... c9

3 changed files with 105 additions and 124 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/Markdown-2.6.11.tar.gz
SOURCES/Markdown-3.3.4.tar.gz

View File

@ -1 +1 @@
4fb4cb6c46eac3dea20d38f9df70f375f73bdd2e SOURCES/Markdown-2.6.11.tar.gz
e6a49d903afcaeb861ee53ffe8751640ca97b2c8 SOURCES/Markdown-3.3.4.tar.gz

View File

@ -1,176 +1,157 @@
%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.3.4
Release: 4%{?dist}
Summary: Markdown implementation in Python
License: BSD
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
This is a Python implementation of John Grubers 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
%endif
%{?python_provide:%python_provide python2-%{pkgname}}
%description -n python2-%{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 python2
there are a few very minor differences.
%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
BuildRequires: python%{python3_pkgversion}-setuptools
%if 0%{?rhel} && 0%{?rhel} < 9
BuildRequires: python%{python3_pkgversion}-importlib-metadata
Requires: python%{python3_pkgversion}-importlib-metadata
%endif
Conflicts: python2-%{pkgname} < 3.1-2
%{?python_provide:%python_provide python%{python3_pkgversion}-%{pkgname}}
%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
%prep
%setup -qc -n %{srcname}-%{version}
%if %{with python2}
cp -a %{srcname}-%{version} python2
%endif # with python2
%if %{with python3}
cp -a %{srcname}-%{version} python3
%endif # with python3
%autosetup -p1 -n %{srcname}-%{version}
%build
%if %{with python2}
pushd python2
%py2_build
popd
%endif # with python2
%if %{with python3}
pushd python3
%py3_build
popd
%endif # with python3
%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
# 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}
# temporarily skip packaging docs - see also
# https://github.com/Python-Markdown/markdown/issues/621
#doc python3/build/docs/*
%license python3/LICENSE.*
%license LICENSE.*
%{python3_sitelib}/*
%{_bindir}/markdown_py
%{_bindir}/markdown_py-3
%{_bindir}/markdown_py-%{python3_version}
%endif # with python3
%changelog
* Thu Jun 14 2018 Charalampos Stratakis <cstratak@redhat.com> - 2.6.11-2
- Conditionalize the python2 subpackage
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.3.4-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.3.4-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Sat Feb 27 2021 Thomas Moschny <thomas.moschny@gmx.de> - 3.3.4-2
- Apply PR6 by Igor Raits <ignatenkobrain@fedoraproject.org>: 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 <thomas.moschny@gmx.de> - 3.3.4-1
- Update to 3.3.4.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sun Oct 25 2020 Thomas Moschny <thomas.moschny@gmx.de> - 3.3.3-1
- Update to 3.3.3.
* Sun Oct 25 2020 Thomas Moschny <thomas.moschny@gmx.de> - 3.3.2-1
- Update to 3.3.2.
* Tue Oct 13 2020 Thomas Moschny <thomas.moschny@gmx.de> - 3.3.1-1
- Update to 3.3.1.
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 3.2.2-3
- Rebuilt for Python 3.9
* Sat May 16 2020 Thomas Moschny <thomas.moschny@gmx.de> - 3.2.2-2
- Update BRs.
* Sat May 16 2020 Thomas Moschny <thomas.moschny@gmx.de> - 3.2.2-1
- Update to 3.2.2.
* Sat Feb 22 2020 Thomas Moschny <thomas.moschny@gmx.de> - 3.2.1-1
- Update to 3.2.1.
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.1-6
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.1-5
- Rebuilt for Python 3.8
* Tue Aug 13 2019 Thomas Moschny <thomas.moschny@gmx.de> - 3.1.1-4
- Drop versioned binaries.
* Tue Aug 13 2019 Gwyn Ciesla <gwync@protonmail.com> - 3.1.1-3
- Drop Python 2.
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat May 25 2019 Thomas Moschny <thomas.moschny@gmx.de> - 3.1.1-1
- Update to 3.1.1.
* Fri May 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1-2
- Move /usr/bin/markdown_py to python3-markdown (#1705777)
* Tue Mar 26 2019 Thomas Moschny <thomas.moschny@gmx.de> - 3.1-1
- Update to 3.1.
* Mon Mar 25 2019 Thomas Moschny <thomas.moschny@gmx.de> - 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 <releng@fedoraproject.org> - 2.6.11-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sun Jun 17 2018 Miro Hrončok <mhroncok@redhat.com> - 2.6.11-3
- Rebuilt for Python 3.7
* Sun Jun 3 2018 Thomas Moschny <thomas.moschny@gmx.de> - 2.6.11-2
- Try to fix a FTBFS with Python 3.7 (rhbz#1583678).
* Sun Feb 11 2018 Thomas Moschny <thomas.moschny@gmx.de> - 2.6.11-1
- Update to 2.6.11.