From d691f354ba5ad241929be6e1ac817f87f9e35140 Mon Sep 17 00:00:00 2001 From: Dave Johansen Date: Mon, 19 Dec 2016 22:29:15 -0700 Subject: [PATCH] Update to 4.4.0 --- .gitignore | 1 + breathe_python3.patch | 59 ------------------------------------------- python-breathe.spec | 10 +++++--- sources | 2 +- 4 files changed, 8 insertions(+), 64 deletions(-) delete mode 100644 breathe_python3.patch diff --git a/.gitignore b/.gitignore index 0304e69..68a1864 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /breathe-a423389dfe2935962b3b27586602cfc3521fb54a.tar.gz +/breathe-3375ea3c582e190fa08f5cfbd5eea8d68492ac75.tar.gz diff --git a/breathe_python3.patch b/breathe_python3.patch deleted file mode 100644 index 7b7d66a..0000000 --- a/breathe_python3.patch +++ /dev/null @@ -1,59 +0,0 @@ -From a0587f035202e4f6b4eb02ad5a2f33ce93bd0f25 Mon Sep 17 00:00:00 2001 -From: Victor Zverovich -Date: Fri, 29 Apr 2016 08:13:44 -0700 -Subject: [PATCH] Fix compatibility with Python 3 - ---- - breathe/renderer/filter.py | 2 +- - breathe/renderer/mask.py | 4 +++- - breathe/renderer/target.py | 2 +- - 3 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/breathe/renderer/filter.py b/breathe/renderer/filter.py -index d04a94f..e26a2e8 100644 ---- a/breathe/renderer/filter.py -+++ b/breathe/renderer/filter.py -@@ -673,7 +673,7 @@ def create_innerclass_filter(self, options, outerclass=''): - 'private-members': 'private', - } - -- for option, scope in all_options.iteritems(): -+ for option, scope in all_options.items(): - if option in options: - allowed.add(scope) - -diff --git a/breathe/renderer/mask.py b/breathe/renderer/mask.py -index 254fa10..ed6a17c 100644 ---- a/breathe/renderer/mask.py -+++ b/breathe/renderer/mask.py -@@ -18,6 +18,8 @@ - - """ - -+import six -+ - class NoParameterNamesMask(object): - - def __init__(self, data_object): -@@ -43,7 +45,7 @@ def mask(self, data_object): - - # Horrible hack to silence errors on filtering unicode objects - # until we fix the parsing -- if type(data_object) == unicode: -+ if isinstance(data_object, six.text_type): - node_type = "unicode" - else: - raise e -diff --git a/breathe/renderer/target.py b/breathe/renderer/target.py -index 754f260..1709839 100644 ---- a/breathe/renderer/target.py -+++ b/breathe/renderer/target.py -@@ -33,7 +33,7 @@ def __init__(self, node_factory): - - def create_target_handler(self, options, project_info, document): - -- if options.has_key("no-link"): -+ if "no-link" in options: - return NullTargetHandler() - - return TargetHandler(project_info, self.node_factory, document) diff --git a/python-breathe.spec b/python-breathe.spec index 277fed3..efac8cc 100644 --- a/python-breathe.spec +++ b/python-breathe.spec @@ -1,19 +1,18 @@ %global owner michaeljones -%global commit0 a423389dfe2935962b3b27586602cfc3521fb54a +%global commit0 3375ea3c582e190fa08f5cfbd5eea8d68492ac75 %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.2.0 -Release: 5%{?dist} +Version: 4.4.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: breathe_python3.patch BuildArch: noarch @@ -86,6 +85,9 @@ rm documentation/build/html/.buildinfo %license LICENSE %changelog +* Mon Dec 19 2016 Dave Johansen - 4.4.0-1 +- Upstream release + * Mon Dec 19 2016 Miro HronĨok - 4.2.0-5 - Rebuild for Python 3.6 diff --git a/sources b/sources index 149e939..83c4e97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64d7a7459a8e098b04b554a612fe30ae breathe-a423389dfe2935962b3b27586602cfc3521fb54a.tar.gz +SHA512 (breathe-3375ea3c582e190fa08f5cfbd5eea8d68492ac75.tar.gz) = 6e4a4835aa2d32d34d37049e0392aab4a7be045752447e806b36934b6e790224e960bcc7cdcaec2b6bed6b8aa6ae132b71618b5373895f3ba902743381d14005