From e20d80c56f30d579eb5b0a09af26aa23690aa4d8 Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Mar 09 2017 14:29:45 +0000
Subject: The two patches from last commit were not needed for EL 7.


Signed-off-by: Randy Barlow <randy@electronsweatshop.com>

---

diff --git a/0000-New-setting-in-latest-docutils.patch b/0000-New-setting-in-latest-docutils.patch
deleted file mode 100644
index 81f629a..0000000
--- a/0000-New-setting-in-latest-docutils.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3cdc25a10f95549c163fa0b818d0ffd0f4a64470 Mon Sep 17 00:00:00 2001
-From: Randy Barlow <randy@electronsweatshop.com>
-Date: Tue, 7 Mar 2017 21:59:27 -0500
-Subject: [PATCH] New setting in latest docutils
-
-This patch was originally authored by Marc-Antoine Parent and was
-backported for cornice-1.1.0 by Randy Barlow.
-
-Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- cornice/ext/sphinxext.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cornice/ext/sphinxext.py b/cornice/ext/sphinxext.py
-index ae4f41a..fe00926 100644
---- a/cornice/ext/sphinxext.py
-+++ b/cornice/ext/sphinxext.py
-@@ -282,6 +282,7 @@ def rst2node(data):
-     document.settings.tab_width = 4
-     document.settings.pep_references = False
-     document.settings.rfc_references = False
-+    document.settings.character_level_inline_markup = False
-     document.settings.env = Env()
-     parser.parse(data, document)
-     if len(document.children) == 1:
--- 
-2.12.0
-
diff --git a/0001-Initialize-the-ref_context-as-a-dictionary.patch b/0001-Initialize-the-ref_context-as-a-dictionary.patch
deleted file mode 100644
index c2bb852..0000000
--- a/0001-Initialize-the-ref_context-as-a-dictionary.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1f10b0b937eeb28adced360d4fa2ca76e4fe9191 Mon Sep 17 00:00:00 2001
-From: Randy Barlow <randy@electronsweatshop.com>
-Date: Tue, 7 Mar 2017 22:03:10 -0500
-Subject: [PATCH] Initialize the ref_context as a dictionary.
-
-fixes #7
-
-Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- cornice/ext/sphinxext.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cornice/ext/sphinxext.py b/cornice/ext/sphinxext.py
-index fe00926..b00fb44 100644
---- a/cornice/ext/sphinxext.py
-+++ b/cornice/ext/sphinxext.py
-@@ -284,6 +284,7 @@ def rst2node(data):
-     document.settings.rfc_references = False
-     document.settings.character_level_inline_markup = False
-     document.settings.env = Env()
-+    document.settings.env.ref_context = {}
-     parser.parse(data, document)
-     if len(document.children) == 1:
-         return document.children[0]
--- 
-2.12.0
-
diff --git a/python-cornice.spec b/python-cornice.spec
index b4c8e45..52c83f9 100644
--- a/python-cornice.spec
+++ b/python-cornice.spec
@@ -19,7 +19,7 @@
 Name:             python-cornice
 Summary:          Define Web Services in Pyramid
 Version:          1.1.0
-Release:          2%{?dist}
+Release:          3%{?dist}
 
 License:          MPLv2.0
 URL:              https://pypi.python.org/pypi/cornice
@@ -27,11 +27,7 @@ Source0:          https://pypi.python.org/packages/source/c/%{module}/%{module}-
 # This file is missing from the tarball
 #     https://github.com/mozilla-services/cornice/pull/240
 Source1:          spore_validation.rx
-# https://github.com/Cornices/cornice.ext.sphinx/pull/5
-Patch0:           0000-New-setting-in-latest-docutils.patch
-# https://github.com/Cornices/cornice.ext.sphinx/pull/9
-Patch1:           0001-Initialize-the-ref_context-as-a-dictionary.patch
-Patch2:           %{name}-webob.patch
+Patch0:           %{name}-webob.patch
 
 
 BuildArch:        noarch
@@ -119,10 +115,8 @@ Generate documentation for Web Services.
 %prep
 %setup -q -n %{module}-%{version}
 
-%patch0 -p1
-%patch1 -p1
 %if 0%{?rhel} <= 7
-%patch2 -p0 -b .webob
+%patch0 -p0 -b .webob
 %endif
 
 # This file is missing from the tarball
@@ -188,6 +182,9 @@ popd
 
 
 %changelog
+* Thu Mar 09 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 1.1.0-3
+- Further inspection revealed that the two patches were not needed for EL 7.
+
 * Tue Mar 07 2017 Randy Barlow <bowlofeggs@fedoraproject.org> - 1.1.0-2
 - Apply two patches to allow autodoc generation to work again (#1430185, #1430186).