From: Maksym Yatsenko <myatsenko@mirantis.com>
Date: Wed, 5 Nov 2014 13:00:33 +0000 (+0200)
Subject: Remove renaming oslosphinx to oslo.sphinx:
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F15%2F615%2F2;p=openstack-build%2Fcinder-build.git

Remove renaming oslosphinx to oslo.sphinx:
0003-Revert-Switch-over-to-oslosphinx.patch was removed.

Change-Id: I6228eda8906f0236d18ad443062d51a64975a1dd
---

diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index df859e973..000000000
--- a/.gitreview
+++ /dev/null
@@ -1,5 +0,0 @@
-[gerrit]
-host=gerrit.mirantis.com
-project=openstack-ci/openstack/cinder-build
-defaultremote=gerrit-mirantis
-defaultbranch=openstack-ci/fuel-5.0/2014.1
diff --git a/rpm/SOURCES/0003-Revert-Switch-over-to-oslosphinx.patch b/rpm/SOURCES/0003-Revert-Switch-over-to-oslosphinx.patch
deleted file mode 100644
index f4437c125..000000000
--- a/rpm/SOURCES/0003-Revert-Switch-over-to-oslosphinx.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 15cc208adf811d9a83e8f820fb4be775c5db9a00 Mon Sep 17 00:00:00 2001
-From: Eric Harney <eharney@redhat.com>
-Date: Thu, 27 Mar 2014 14:24:57 -0400
-Subject: [PATCH] Revert "Switch over to oslosphinx"
-
-This reverts commit ea7d4a599224b5d0c7674d03993bbe72c49f0d51.
----
- 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 ac2eadc..238a922 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -34,7 +34,7 @@ extensions = ['sphinx.ext.autodoc',
-               'sphinx.ext.pngmath',
-               'sphinx.ext.ifconfig',
-               'sphinx.ext.graphviz',
--              'oslosphinx',
-+              'oslo.sphinx',
-               ]
- 
- # autodoc generation is a bit aggressive and a nuisance
-diff --git a/test-requirements.txt b/test-requirements.txt
-index 56746da..15308b9 100644
---- a/test-requirements.txt
-+++ b/test-requirements.txt
-@@ -13,4 +13,4 @@ sphinx>=1.1.2,<1.2
- python-subunit>=0.0.18
- testtools>=0.9.34
- testrepository>=0.0.18
--oslosphinx
-+oslo.sphinx
diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec
index a92a0bee2..facfa5def 100644
--- a/rpm/SPECS/openstack-cinder.spec
+++ b/rpm/SPECS/openstack-cinder.spec
@@ -25,7 +25,6 @@ Source20:         cinder-sudoers
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
 Patch0002: 0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
-Patch0003: 0003-Revert-Switch-over-to-oslosphinx.patch
 Patch0004: 0004-notify-calling-process-we-are-ready-to-serve.patch
 Patch0005: 0005-Move-notification-point-to-a-better-place.patch
 
@@ -144,7 +143,6 @@ This package contains documentation files for cinder.
 
 %patch0001 -p1
 %patch0002 -p1
-%patch0003 -p1
 %patch0004 -p1
 %patch0005 -p1
 
@@ -451,3 +449,5 @@ fi
 
 * Mon Sep  3 2012 Pádraig Brady <P@draigBrady.com> - 2012.2-0.2.f3
 - Initial release
+
+