Update to 2.6.11.

This commit is contained in:
Thomas Moschny 2018-02-11 10:03:56 +01:00
parent c9d3d67518
commit bea5080da8
2 changed files with 28 additions and 30 deletions

View File

@ -1,16 +1,18 @@
%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7
%global with_python3 1 %bcond_without python3
%else
%bcond_with python3
%endif %endif
%global srcname Markdown %global srcname Markdown
%global pkgname markdown %global pkgname markdown
Name: python-%{pkgname} Name: python-%{pkgname}
Version: 2.6.9 Version: 2.6.11
Release: 3%{?dist} Release: 1%{?dist}
Summary: Markdown implementation in Python Summary: Markdown implementation in Python
License: BSD License: BSD
URL: https://pythonhosted.org/%{srcname}/ URL: https://python-markdown.github.io/
Source0: https://files.pythonhosted.org/packages/source/M/%{srcname}/%{srcname}-%{version}.tar.gz Source0: https://files.pythonhosted.org/packages/source/M/%{srcname}/%{srcname}-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
@ -38,7 +40,7 @@ almost completely compliant with the reference implementation, though
there are a few known issues. there are a few known issues.
%if 0%{?with_python3} %if %{with python3}
%package -n python%{python3_pkgversion}-%{pkgname} %package -n python%{python3_pkgversion}-%{pkgname}
Summary: Markdown implementation in Python Summary: Markdown implementation in Python
BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-devel
@ -50,27 +52,16 @@ BuildRequires: python%{python3_pkgversion}-PyYAML
This is a Python implementation of John Gruber's Markdown. It is This is a Python implementation of John Gruber's Markdown. It is
almost completely compliant with the reference implementation, though almost completely compliant with the reference implementation, though
there are a few known issues. there are a few known issues.
%endif # with_python3 %endif # with python3
%prep %prep
%setup -qc -n %{srcname}-%{version} %setup -qc -n %{srcname}-%{version}
pushd %{srcname}-%{version}
# remove shebangs
find markdown -type f -name '*.py' \
-exec sed -i -e '/^#!/{1D}' {} \;
# fix line-ending
find bin docs -type f \
-exec sed -i 's/\r//' {} \;
popd
mv %{srcname}-%{version} python2 mv %{srcname}-%{version} python2
%if 0%{?with_python3} %if %{with python3}
cp -a python2 python3 cp -a python2 python3
%endif # with_python3 %endif # with python3
%build %build
@ -78,11 +69,11 @@ pushd python2
%py2_build %py2_build
popd popd
%if 0%{?with_python3} %if %{with python3}
pushd python3 pushd python3
%py3_build %py3_build
popd popd
%endif # with_python3 %endif # with python3
%install %install
@ -99,7 +90,7 @@ PYTHONPATH=%{buildroot}%{python2_sitelib} \
LICENSE.md > LICENSE.html LICENSE.md > LICENSE.html
popd popd
%if 0%{?with_python3} %if %{with python3}
pushd python3 pushd python3
%py3_install %py3_install
@ -112,7 +103,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} \
%{buildroot}%{_bindir}/markdown_py-%{python3_version} \ %{buildroot}%{_bindir}/markdown_py-%{python3_version} \
LICENSE.md > LICENSE.html LICENSE.md > LICENSE.html
popd popd
%endif # with_python3 %endif # with python3
# 2.X binary is called by default for now # 2.X binary is called by default for now
ln -s markdown_py-%{python2_version} %{buildroot}%{_bindir}/markdown_py ln -s markdown_py-%{python2_version} %{buildroot}%{_bindir}/markdown_py
@ -123,15 +114,17 @@ pushd python2
%{__python2} run-tests.py %{__python2} run-tests.py
popd popd
%if 0%{?with_python3} %if %{with python3}
pushd python3 pushd python3
%{__python3} run-tests.py %{__python3} run-tests.py
popd popd
%endif # with_python3 %endif # with python3
%files -n python2-%{pkgname} %files -n python2-%{pkgname}
%doc python2/build/docs/* # temporarily skip packaging docs - see also
# https://github.com/Python-Markdown/markdown/issues/621
#doc python2/build/docs/*
%license python2/LICENSE.* %license python2/LICENSE.*
%{python2_sitelib}/* %{python2_sitelib}/*
%{_bindir}/markdown_py %{_bindir}/markdown_py
@ -139,17 +132,22 @@ popd
%{_bindir}/markdown_py-%{python2_version} %{_bindir}/markdown_py-%{python2_version}
%if 0%{?with_python3} %if %{with python3}
%files -n python%{python3_pkgversion}-%{pkgname} %files -n python%{python3_pkgversion}-%{pkgname}
%doc python3/build/docs/* # temporarily skip packaging docs - see also
# https://github.com/Python-Markdown/markdown/issues/621
#doc python3/build/docs/*
%license python3/LICENSE.* %license python3/LICENSE.*
%{python3_sitelib}/* %{python3_sitelib}/*
%{_bindir}/markdown_py-3 %{_bindir}/markdown_py-3
%{_bindir}/markdown_py-%{python3_version} %{_bindir}/markdown_py-%{python3_version}
%endif # with_python3 %endif # with python3
%changelog %changelog
* Sun Feb 11 2018 Thomas Moschny <thomas.moschny@gmx.de> - 2.6.11-1
- Update to 2.6.11.
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.9-3 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (Markdown-2.6.9.tar.gz) = d00c800dc7c1ae0753cbcddd755ade7d593a8d9c9d4ffc6eb8765233a44027a75b68948c14b4469d7aa0e7f74029e9f60159d81ed40b3d2e770c68a81533ccfa SHA512 (Markdown-2.6.11.tar.gz) = 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66