From 4600bbb38b2e2d1b09b81ac8394cb53ea5ee1a2e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 12 2015 10:16:30 +0000
Subject: import python-sphinx-1.1.3-9.el7


---

diff --git a/SOURCES/fix-container-directive-handling.patch b/SOURCES/fix-container-directive-handling.patch
new file mode 100644
index 0000000..d633d1b
--- /dev/null
+++ b/SOURCES/fix-container-directive-handling.patch
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User Georg Brandl <georg@python.org>
+# Date 1351447311 -3600
+# Node ID 447fab1105ec52ef017c8749be404e7b268b0395
+# Parent  cfee81fc93bba3cab34691968003aa795373ad50
+Closes #1018: Fix "container" directive handling in the text builder.
+
+diff --git a/sphinx/writers/text.py b/sphinx/writers/text.py
+--- a/sphinx/writers/text.py
++++ b/sphinx/writers/text.py
+@@ -714,6 +714,11 @@
+     def depart_inline(self, node):
+         pass
+ 
++    def visit_container(self, node):
++        pass
++    def depart_container(self, node):
++        pass
++
+     def visit_problematic(self, node):
+         self.add_text('>>')
+     def depart_problematic(self, node):
diff --git a/SPECS/python-sphinx.spec b/SPECS/python-sphinx.spec
index 63e2e45..3f85c5a 100644
--- a/SPECS/python-sphinx.spec
+++ b/SPECS/python-sphinx.spec
@@ -9,7 +9,7 @@
 
 Name:       python-sphinx
 Version:    1.1.3
-Release:    8%{?dist}
+Release:    9%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -28,6 +28,8 @@ Patch0: sphinx-docutils-0.10.patch
 # Already applied upstream as part of https://bitbucket.org/birkenfeld/sphinx/commits/fc1db93d21a5a535d9d62e5a0c9f0a806a8c117a
 Patch1: Sphinx-1.1.3-fix_quoting_in_inheritance.patch
 
+Patch2: fix-container-directive-handling.patch
+
 BuildArch:     noarch
 BuildRequires: python2-devel >= 2.4
 BuildRequires: python-setuptools
@@ -141,6 +143,7 @@ sed '1d' -i sphinx/pycode/pgen2/token.py
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -261,6 +264,10 @@ popd
 
 
 %changelog
+* Mon Jun 22 2015 Matej Stuchlik <mstuchli@redhat.com> - 1.1.3-9
+- Fix "container" directive handling in the text builder
+Resolves: rhbz#1065137
+
 * Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 1.1.3-8
 - Mass rebuild 2013-12-27