Build from master

[openstack-build/cinder-build.git] / rpm / SOURCES / 0001-Remove-runtime-dep-on-python-pbr-python-d2to1.patch

diff --git a/rpm/SOURCES/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch b/rpm/SOURCES/0001-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
similarity index 90%
rename from rpm/SOURCES/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
rename to rpm/SOURCES/0001-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
index 5fd94c95b8d0ced843ad7bb74d6a0169636f6837..a056afbd2588a9adb9e7092f2c4c453fafc0476b 100644 (file)
--- a/rpm/SOURCES/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
+++ b/rpm/SOURCES/0001-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
@@ -1,4 +1,4 @@
-From 6ed6db76f6e6b1a579d07c3db63283d444385c14 Mon Sep 17 00:00:00 2001
+From 302c285b0193bcae47aaaaec49f51340b4fbe6e7 Mon Sep 17 00:00:00 2001
 From: Eric Harney <eharney@redhat.com>
 Date: Thu, 13 Jun 2013 17:50:12 -0400
 Subject: [PATCH] Remove runtime dep on python-pbr, python-d2to1
@@ -9,10 +9,10 @@ Requires RPM spec to fill in REDHATCINDERVERSION.
  1 file changed, 13 insertions(+), 3 deletions(-)
 
 diff --git a/cinder/version.py b/cinder/version.py
-index ad1ebc0..b4f6fd8 100644
+index e3dbd70..ab8f888 100644
 --- a/cinder/version.py
 +++ b/cinder/version.py
-@@ -14,12 +14,22 @@
+@@ -12,12 +12,22 @@
  #    License for the specific language governing permissions and limitations
  #    under the License.