de-fuzz puppet-cinder patch

With rpm version < 4.13, patch cmd will create .orig file for fuzzy
patch in default. And this .orig file may lead to rpmbuild failure
"error: Installed (but unpackaged) file(s) found:"

Please visit below link to get more detail info:
https://bugs.launchpad.net/starlingx/+bug/1794611

Story: 2003917
Task: 26964

Change-Id: I68d15b13496267003a6aa23b350ecf3f30a0a824
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-10-09 23:02:50 +08:00
parent c745dcef93
commit 996e35f95b
1 changed files with 6 additions and 6 deletions

View File

@ -1,17 +1,17 @@
From 7fcdc8a940ce9b074f2c47e0ba683b457f2f93df Mon Sep 17 00:00:00 2001
From e8f063bfcd6ea5609c043e45608abd2b7727e580 Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Mon, 9 Apr 2018 11:14:52 -0500
Subject: [PATCH] Patch for removal of default_volume_type from API
Subject: Patch for removal of default_volume_type from API
---
SPECS/puppet-cinder.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-cinder.spec b/SPECS/puppet-cinder.spec
index 7c428d3..8cd53c4 100644
index 9d03ef3..af02638 100644
--- a/SPECS/puppet-cinder.spec
+++ b/SPECS/puppet-cinder.spec
@@ -13,6 +13,7 @@ Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_versio
@@ -11,6 +11,7 @@ Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_versio
Patch0001: 0001-Roll-up-TIS-patches.patch
Patch0002: 0002-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch
Patch0003: 0003-CGTS-9191-Add-nova-interface-config-option.patch
@ -19,7 +19,7 @@ index 7c428d3..8cd53c4 100644
BuildArch: noarch
@@ -32,6 +33,7 @@ Puppet module for OpenStack Cinder
@@ -30,6 +31,7 @@ Puppet module for OpenStack Cinder
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
@ -28,5 +28,5 @@ index 7c428d3..8cd53c4 100644
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1
2.7.4