Removing 0013-Revert-Switch-to-oslo.sphinx.patch

and removing "sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py"
from rpm spec.

Change-Id: I0878ddbce1544003f9c84c661c799b00b78d91a4

diff --git a/.gitreview b/.gitreview
index 1bb0c6e23ebb4470224808d51a7c7ba4c7de9ddb..a20930f034e41fde10a9014ddbdb1f3acff5422b 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,5 @@
 [gerrit]
 host=review.fuel-infra.org
-project=packages/centos6/python-django-openstack-auth
+project=openstack-build/horizon-build
 port=29418
+

diff --git a/rpm/SOURCES/0013-Revert-Switch-to-oslo.sphinx.patch b/rpm/SOURCES/0013-Revert-Switch-to-oslo.sphinx.patch
deleted file mode 100644 (file)
index f0574c0..0000000
--- a/rpm/SOURCES/0013-Revert-Switch-to-oslo.sphinx.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a33fc58c5bc848953c2298479a956047a95c6f58 Mon Sep 17 00:00:00 2001
-From: Maksym Yatsenko <myatsenko@mirantis.com>
-Date: Thu, 23 Oct 2014 14:10:40 +0300
-Subject: [PATCH] Revert "Switch to oslo.sphinx"
-
----
- doc/source/conf.py    | 2 +-
- test-requirements.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 2e00cc0..e912ce7 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -144,7 +144,7 @@ extensions = ['sphinx.ext.autodoc',
-               'sphinx.ext.coverage',
-               'sphinx.ext.pngmath',
-               'sphinx.ext.viewcode',
--              'oslosphinx',
-+              'oslo.sphinx',
-               ]
- 
- # Add any paths that contain templates here, relative to this directory.
-diff --git a/test-requirements.txt b/test-requirements.txt
-index 67ba616..01a6520 100644
---- a/test-requirements.txt
-+++ b/test-requirements.txt
-@@ -8,7 +8,7 @@ nose-exclude
- nosehtmloutput>=0.0.3
- nosexcover
- openstack.nose_plugin>=0.7
--oslosphinx
-+oslo.sphinx
- selenium
- sphinx>=1.1.2,<1.1.999
- testtools>=0.9.34
--- 
-1.9.1
-

diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec
index b351cc68cf9edf04a179838e2bf9cda5df5055fb..2e01ef3de862bfb3b8aaf1427dda1e70db058d1b 100644 (file)
--- a/rpm/SPECS/python-django-horizon.spec
+++ b/rpm/SPECS/python-django-horizon.spec
@@ -35,7 +35,7 @@ Patch0009: 0009-fix-flake8-issues.patch
 Patch0010: 0010-remove-runtime-dep-to-python-pbr.patch
 Patch0011: 0011-Add-Change-password-link-to-the-RCUE-theme.patch
 Patch0012: 0012-Re-enable-offline-compression.patch
-Patch0013: 0013-Revert-Switch-to-oslo.sphinx.patch
+
 
 
 BuildArch:  noarch
@@ -175,8 +175,6 @@ find . -name "django*.po" -exec rm -f '{}' \;
 # to distutils requires_dist config
 rm -rf {test-,}requirements.txt tools/{pip,test}-requires
 
-# make doc build compatible with python-oslo-sphinx RPM
-sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
 
 # create images for custom theme
 #mkdir -p openstack_dashboard_theme/static/dashboard/img
@@ -503,3 +501,5 @@ sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/loc
 
 * Mon Jan 30 2012 Cole Robinson <crobinso@redhat.com> - 2012.1-0.1.e3
 - Initial package
+
+