diff --git a/fix-commonmark-compatibility.patch b/fix-commonmark-compatibility.patch deleted file mode 100644 index b462013..0000000 --- a/fix-commonmark-compatibility.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- recommonmark/parser.py 2016-01-05 22:59:38.000000000 +0100 -+++ recommonmark/parser.py 2017-07-20 23:22:53.620321088 +0200 -@@ -3,7 +3,7 @@ - - from docutils import parsers, nodes - --from CommonMark import DocParser, HTMLRenderer -+from CommonMark import Parser, HtmlRenderer - from warnings import warn - - __all__ = ['CommonMarkParser'] -@@ -80,7 +80,7 @@ - self.current_node = document - self.section_handler = _SectionHandler(document) - -- parser = DocParser() -+ parser = Parser() - - ast = parser.parse(inputstring + '\n') - -@@ -220,7 +220,7 @@ - - - def inline_entity(inline): -- val = HTMLRenderer().renderInline(inline) -+ val = HtmlRenderer().renderInline(inline) - entity_node = nodes.paragraph('', val, format='html') - return entity_node - diff --git a/python-recommonmark.changes b/python-recommonmark.changes index c4eb0d3..6d06f39 100644 --- a/python-recommonmark.changes +++ b/python-recommonmark.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 15 21:26:43 UTC 2019 - Sebastian Wagner + +- Update to version 0.5.0: + * No upstream changelog available. +- remove unneeded fix-commonmark-compatibility.patch + ------------------------------------------------------------------- Fri Dec 7 10:17:42 UTC 2018 - Tomáš Chvátal diff --git a/python-recommonmark.spec b/python-recommonmark.spec index e9b7619..9a0f543 100644 --- a/python-recommonmark.spec +++ b/python-recommonmark.spec @@ -1,7 +1,7 @@ # # spec file for package python-recommonmark # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python Name: python-recommonmark -Version: 0.4.0 +Version: 0.5.0 Release: 0 Summary: Python docutils-compatibility bridge to CommonMark License: MIT @@ -27,15 +27,17 @@ Group: Development/Languages/Python URL: https://github.com/rtfd/recommonmark Source0: https://files.pythonhosted.org/packages/source/r/recommonmark/recommonmark-%{version}.tar.gz Source1: https://raw.githubusercontent.com/rtfd/recommonmark/master/license.md -# PATCH-FIX-UPSTREAM fix-commonmark-compatibility.patch sebix+novell.com@sebix.at -- fix commonmark renamings -Patch0: fix-commonmark-compatibility.patch -BuildRequires: %{python_module CommonMark} -BuildRequires: %{python_module docutils} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-CommonMark -Requires: python-docutils +# SECTION tests +#BuildRequires: %%{python_module CommonMark >= 0.7.3} +#BuildRequires: %%{python_module Sphinx >= 1.3.1} +#BuildRequires: %%{python_module docutils >= 0.11} +# /SECTION tests +Requires: python-CommonMark >= 0.7.3 +Requires: python-Sphinx >= 1.3.1 +Requires: python-docutils >= 0.11 Requires(post): update-alternatives Requires(preun): update-alternatives Provides: python-reCommonMark = %{version} @@ -57,13 +59,13 @@ http://recommonmark.readthedocs.org %prep %setup -q -n recommonmark-%{version} -%patch0 # Remove upstream's egg-info rm -rf %{pypi_name}.egg-info #Add missing license and readme cp -a %{SOURCE1} . # find and remove unneeded shebangs find recommonmark -name "*.py" | xargs sed -i '1 {/^#!/ d}' +sed -i 's/from commonmark import Parser/from CommonMark import Parser/' recommonmark/parser.py %build %python_build @@ -79,6 +81,10 @@ find recommonmark -name "*.py" | xargs sed -i '1 {/^#!/ d}' %python_clone -a %{buildroot}%{_bindir}/cm2xetex %python_clone -a %{buildroot}%{_bindir}/cm2xml +# The tests in the tarball are missing all testdata, fixed in the next version: https://github.com/rtfd/recommonmark/commit/8e02e8309a011a7592d6b88c9a9560667964ffab +#%%check +#%%python_exec setup.py test + %post %{python_install_alternative cm2man cm2latex cm2xetex cm2pseudoxml cm2html cm2xml} @@ -95,5 +101,6 @@ find recommonmark -name "*.py" | xargs sed -i '1 {/^#!/ d}' %python_alternative %{_bindir}/cm2xml %{python_sitelib}/recommonmark/ %{python_sitelib}/recommonmark-%{version}-py*.egg-info +%doc README.md %changelog diff --git a/recommonmark-0.4.0.tar.gz b/recommonmark-0.4.0.tar.gz deleted file mode 100644 index 55345fa..0000000 --- a/recommonmark-0.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d -size 7112 diff --git a/recommonmark-0.5.0.tar.gz b/recommonmark-0.5.0.tar.gz new file mode 100644 index 0000000..d74ae81 --- /dev/null +++ b/recommonmark-0.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a520b8d25071a51ae23a27cf6252f2fe387f51bdc913390d83b2b50617f5bb48 +size 21615