Update to 2.3.

- Clean up the specfile a bit.
This commit is contained in:
Thomas Moschny 2013-03-18 22:20:31 +01:00
parent 8c9ed1ab6a
commit c8694409cf
3 changed files with 15 additions and 23 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ Markdown-2.0.3.tar.gz
/Markdown-2.1.1.tar.gz /Markdown-2.1.1.tar.gz
/Markdown-2.2.0.tar.gz /Markdown-2.2.0.tar.gz
/Markdown-2.2.1.tar.gz /Markdown-2.2.1.tar.gz
/Markdown-2.3.tar.gz

View File

@ -8,26 +8,21 @@
%define srcname Markdown %define srcname Markdown
Name: python-markdown Name: python-markdown
Version: 2.2.1 Version: 2.3
Release: 2%{?dist} Release: 1%{?dist}
Summary: Markdown implementation in Python Summary: Markdown implementation in Python
Group: Development/Languages Group: Development/Languages
License: BSD License: BSD
URL: http://packages.python.org/Markdown/ URL: http://packages.python.org/%{srcname}/
Source0: http://pypi.python.org/packages/source/M/%{srcname}/%{srcname}-%{version}.tar.gz Source0: http://pypi.python.org/packages/source/M/%{srcname}/%{srcname}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch BuildArch: noarch
BuildRequires: python-devel BuildRequires: python-devel >= 2.6
BuildRequires: python-nose BuildRequires: python-nose
%if 0%{?rhel} && 0%{?rhel} < 7 Requires: python >= 2.6
BuildRequires: python-elementtree
Requires: python-elementtree
%endif
%if 0%{?with_python3} %if 0%{?with_python3}
BuildRequires: python3-devel BuildRequires: python3-devel >= 3.1
BuildRequires: python3-nose BuildRequires: python3-nose
# for converting before running the tests: Requires: python3 >= 3.1
BuildRequires: /usr/bin/2to3
%endif # with_python3 %endif # with_python3
@ -76,7 +71,6 @@ popd
%install %install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot}
# rename binary # rename binary
@ -96,22 +90,16 @@ ln -s markdown_py-%{python_version} %{buildroot}%{_bindir}/markdown_py
%check %check
./run-tests.py %{__python} run-tests.py
%if 0%{?with_python3} %if 0%{?with_python3}
pushd %{py3dir} pushd %{py3dir}
2to3 -d -w -n markdown tests run-tests.py > /dev/null %{__python3} run-tests.py
./run-tests.py
popd popd
%endif # with_python3 %endif # with_python3
%clean
rm -rf %{buildroot}
%files %files
%defattr(-,root,root,-)
%doc build/docs/* %doc build/docs/*
%{python_sitelib}/* %{python_sitelib}/*
%{_bindir}/markdown_py %{_bindir}/markdown_py
@ -120,7 +108,6 @@ rm -rf %{buildroot}
%if 0%{?with_python3} %if 0%{?with_python3}
%files -n python3-markdown %files -n python3-markdown
%defattr(-,root,root,-)
%doc build/docs/* %doc build/docs/*
%{python3_sitelib}/* %{python3_sitelib}/*
%{_bindir}/markdown_py-%{python3_version} %{_bindir}/markdown_py-%{python3_version}
@ -128,6 +115,10 @@ rm -rf %{buildroot}
%changelog %changelog
* Mon Mar 18 2013 Thomas Moschny <thomas.moschny@gmx.de> - 2.3-1
- Update to 2.3.
- Spec file cleanups.
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.1-2 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

View File

@ -1 +1 @@
9e002c8051fb346cae75060f3302048a Markdown-2.2.1.tar.gz f33677b74fd8e5c8553dbc065787ded3 Markdown-2.3.tar.gz