Update to 2.6.9.

Allow building a python3 subpackage on EPEL7+.
This commit is contained in:
Thomas Moschny 2017-08-30 15:56:08 +02:00
parent a27e05e554
commit 714392a00d
2 changed files with 34 additions and 13 deletions

View File

@ -1,20 +1,18 @@
%if 0%{?fedora} || 0%{?rhel} >= 7
%global with_python3 1
%endif
%global srcname Markdown %global srcname Markdown
%global pkgname markdown %global pkgname markdown
Name: python-%{pkgname} Name: python-%{pkgname}
Version: 2.6.8 Version: 2.6.9
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://pythonhosted.org/%{srcname}/
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
BuildRequires: python2-devel
BuildRequires: python2-nose
BuildRequires: python2-yaml
BuildRequires: python3-devel
BuildRequires: python3-nose
BuildRequires: python3-PyYAML
%description %description
@ -25,6 +23,9 @@ there are a few known issues.
%package -n python2-%{pkgname} %package -n python2-%{pkgname}
Summary: Markdown implementation in Python Summary: Markdown implementation in Python
BuildRequires: python2-devel
BuildRequires: python2-nose
BuildRequires: python2-yaml
%{?python_provide:%python_provide python2-%{pkgname}} %{?python_provide:%python_provide python2-%{pkgname}}
%description -n python2-%{pkgname} %description -n python2-%{pkgname}
@ -33,14 +34,19 @@ almost completely compliant with the reference implementation, though
there are a few known issues. there are a few known issues.
%package -n python3-%{pkgname} %if 0%{?with_python3}
%package -n python%{python3_pkgversion}-%{pkgname}
Summary: Markdown implementation in Python Summary: Markdown implementation in Python
%{?python_provide:%python_provide python3-%{pkgname}} BuildRequires: python3-devel
BuildRequires: python3-nose
BuildRequires: python3-PyYAML
%{?python_provide:%python_provide python%{python3_pkgversion}-%{pkgname}}
%description -n python3-%{pkgname} %description -n python%{python3_pkgversion}-%{pkgname}
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
%prep %prep
@ -57,7 +63,10 @@ find bin docs -type f \
popd popd
mv %{srcname}-%{version} python2 mv %{srcname}-%{version} python2
%if 0%{?with_python3}
cp -a python2 python3 cp -a python2 python3
%endif # with_python3
%build %build
@ -65,9 +74,11 @@ pushd python2
%py2_build %py2_build
popd popd
%if 0%{?with_python3}
pushd python3 pushd python3
%py3_build %py3_build
popd popd
%endif # with_python3
%install %install
@ -84,6 +95,7 @@ PYTHONPATH=%{buildroot}%{python2_sitelib} \
LICENSE.md > LICENSE.html LICENSE.md > LICENSE.html
popd popd
%if 0%{?with_python3}
pushd python3 pushd python3
%py3_install %py3_install
@ -96,6 +108,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
# 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
@ -106,9 +119,11 @@ pushd python2
%{__python2} run-tests.py %{__python2} run-tests.py
popd popd
%if 0%{?with_python3}
pushd python3 pushd python3
%{__python3} run-tests.py %{__python3} run-tests.py
popd popd
%endif # with_python3
%files -n python2-%{pkgname} %files -n python2-%{pkgname}
@ -120,15 +135,21 @@ popd
%{_bindir}/markdown_py-%{python2_version} %{_bindir}/markdown_py-%{python2_version}
%files -n python3-%{pkgname} %if 0%{?with_python3}
%files -n python%{python3_pkgversion}-%{pkgname}
%doc python3/build/docs/* %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
%changelog %changelog
* Wed Aug 30 2017 Thomas Moschny <thomas.moschny@gmx.de> - 2.6.9-1
- Update to 2.6.9.
- Allow building a python3 subpackage on EPEL7+.
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.8-3 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (Markdown-2.6.8.tar.gz) = 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23 SHA512 (Markdown-2.6.9.tar.gz) = d00c800dc7c1ae0753cbcddd755ade7d593a8d9c9d4ffc6eb8765233a44027a75b68948c14b4469d7aa0e7f74029e9f60159d81ed40b3d2e770c68a81533ccfa