diff --git a/.gitignore b/.gitignore index 1cb779f..ff5ea17 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /breathe-a423389dfe2935962b3b27586602cfc3521fb54a.tar.gz /breathe-3375ea3c582e190fa08f5cfbd5eea8d68492ac75.tar.gz /breathe-3ba9c2046322415ef8933654395c84de896ac7b7.tar.gz +/breathe-5bbf647bb222d1d26351dc4ff808ede03f750705.tar.gz diff --git a/python-breathe.spec b/python-breathe.spec index 2d83217..003d8e1 100644 --- a/python-breathe.spec +++ b/python-breathe.spec @@ -1,19 +1,18 @@ %global owner michaeljones -%global commit0 3ba9c2046322415ef8933654395c84de896ac7b7 +%global commit0 5bbf647bb222d1d26351dc4ff808ede03f750705 %global srcname breathe %global _description \ Breathe is an extension to reStructuredText and Sphinx to be able to read and \ render the Doxygen xml output. Name: python-%{srcname} -Version: 4.6.0 -Release: 3%{?dist} +Version: 4.7.0 +Release: 1%{?dist} Summary: Adds support for Doxygen xml output to reStructuredText and Sphinx License: BSD URL: https://github.com/%{owner}/%{srcname} Source0: https://github.com/%{owner}/%{srcname}/archive/%{commit0}.tar.gz#/%{srcname}-%{commit0}.tar.gz -Patch0: python-breathe_node_without_parent.patch BuildArch: noarch @@ -86,6 +85,9 @@ rm documentation/build/html/.buildinfo %license LICENSE %changelog +* Wed Aug 09 2017 Dave Johansen - 4.7.0-1 +- Upstream update + * Sat Aug 05 2017 Dave Johansen - 4.6.0-3 - Fix for node without parent diff --git a/python-breathe_node_without_parent.patch b/python-breathe_node_without_parent.patch deleted file mode 100644 index 40df5d3..0000000 --- a/python-breathe_node_without_parent.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2af44a0d9f40e672dd1989b67d0e90a61deba77e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= -Date: Sat, 6 May 2017 18:31:12 +0200 -Subject: [PATCH] Fix sometimes nodes without a parent would be generated - -This fixes the bug discussed here, where sometimes doc compilation would -crash when using recent Sphinx: - - https://github.com/sphinx-doc/sphinx/issues/3709 ---- - breathe/renderer/sphinxrenderer.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/breathe/renderer/sphinxrenderer.py b/breathe/renderer/sphinxrenderer.py -index 911f5ed..16415dc 100644 ---- a/breathe/renderer/sphinxrenderer.py -+++ b/breathe/renderer/sphinxrenderer.py -@@ -1100,7 +1100,8 @@ def visit_docparamlistitem(self, node): - # - # If there is no description then render then term by itself - if nodelist: -- nodelist[0].children = [term, separator] + nodelist[0].children -+ nodelist[0].insert(0, term) -+ nodelist[0].insert(1, separator) - else: - nodelist = [term] - diff --git a/sources b/sources index 457ac60..58424fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (breathe-3ba9c2046322415ef8933654395c84de896ac7b7.tar.gz) = 241a565c02a5a5b92bc6681688bde87086d0aa808657e1a4210e8440922427eb6afe5f2577501a707cdb6674b50413baf3953d9555b665a952710522c67f6368 +SHA512 (breathe-5bbf647bb222d1d26351dc4ff808ede03f750705.tar.gz) = 4b3a2ff4c97467e9c52f471d721cc1bb66826bef83369b479dbcf56e4666b41e9ddc29ec66e4b2a08a973b92366d273e0e6c03944dbf7e9f05a20ae6c2bc11c9