diff --git a/license.md b/license.md deleted file mode 100644 index 0d4c44d..0000000 --- a/license.md +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014 Steve Genoud - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/python-recommonmark.changes b/python-recommonmark.changes index 6d06f39..5e4e318 100644 --- a/python-recommonmark.changes +++ b/python-recommonmark.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Mar 16 11:01:07 UTC 2019 - Sebastian Wagner + +- Use github tarball including the tests. +- Enable the tests +- Fix compatibility with recent commonmark. + ------------------------------------------------------------------- Tue Jan 15 21:26:43 UTC 2019 - Sebastian Wagner diff --git a/python-recommonmark.spec b/python-recommonmark.spec index 9a0f543..83e48bf 100644 --- a/python-recommonmark.spec +++ b/python-recommonmark.spec @@ -25,15 +25,18 @@ Summary: Python docutils-compatibility bridge to CommonMark License: MIT 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 +# The tests in the pypi tarball are missing all testdata, fixed in the next version: https://github.com/rtfd/recommonmark/commit/8e02e8309a011a7592d6b88c9a9560667964ffab +#Source0: https://files.pythonhosted.org/packages/source/r/recommonmark/recommonmark-%%{version}.tar.gz +Source0: https://github.com/rtfd/recommonmark/archive/0.5.0.tar.gz#/recommonmark-%{version}.tar.gz +#Source1: https://raw.githubusercontent.com/rtfd/recommonmark/master/license.md BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros # SECTION tests -#BuildRequires: %%{python_module CommonMark >= 0.7.3} -#BuildRequires: %%{python_module Sphinx >= 1.3.1} -#BuildRequires: %%{python_module docutils >= 0.11} +BuildRequires: %{python_module CommonMark >= 0.7.3} +BuildRequires: %{python_module Sphinx >= 1.3.1} +BuildRequires: %{python_module docutils >= 0.11} +BuildRequires: %{python_module future} # /SECTION tests Requires: python-CommonMark >= 0.7.3 Requires: python-Sphinx >= 1.3.1 @@ -62,10 +65,9 @@ http://recommonmark.readthedocs.org # Remove upstream's egg-info rm -rf %{pypi_name}.egg-info #Add missing license and readme -cp -a %{SOURCE1} . +#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 @@ -81,9 +83,8 @@ sed -i 's/from commonmark import Parser/from CommonMark import Parser/' recommon %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 +%check +%python_exec setup.py test %post %{python_install_alternative cm2man cm2latex cm2xetex cm2pseudoxml cm2html cm2xml} @@ -101,6 +102,6 @@ sed -i 's/from commonmark import Parser/from CommonMark import Parser/' recommon %python_alternative %{_bindir}/cm2xml %{python_sitelib}/recommonmark/ %{python_sitelib}/recommonmark-%{version}-py*.egg-info -%doc README.md +%doc README.md CHANGELOG.md %changelog diff --git a/recommonmark-0.5.0.tar.gz b/recommonmark-0.5.0.tar.gz index d74ae81..e1524cb 100644 --- a/recommonmark-0.5.0.tar.gz +++ b/recommonmark-0.5.0.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a520b8d25071a51ae23a27cf6252f2fe387f51bdc913390d83b2b50617f5bb48 -size 21615 +oid sha256:27b7cc2b81c297e82039df20b0291fdeddc10b71b04c9f18b5d46efacd02f2f2 +size 22356