de-fuzz puppet-horizon patches

Problem:
- Centos 7.5 upgraded puppet-horizons.
- Porting of puppet-horizons patches did not resolve and 'fuzz' in the line
  numbers of the patches.
- If puppet-horizon is built by rpm 4.11, or default version of rpm
  until 4.14 is compiled, a fuzzy patch results in the creating
  of an .orig file.
- Packaging of puppet-horizons failes due to the unexpected, and
  unpackaged .orig file

Solution:
  Safest solution is to de-fuzz our puppet-horizons patches.

Story: 2003389
Task: 26755

Change-Id: Ica5404ab1135dd4d0e771f2dd03e46a3c6052c53
Signed-off-by: Sun Austin <austin.sun@intel.com>

config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/meta_patches/0002-update-memcached-dependency.patch

@@ -1,4 +1,4 @@
-From 81fde18810538b9c01e32ef76dbbd0b48761dcb8 Mon Sep 17 00:00:00 2001
+From a59312d5e966405d0053acae383f315d8ffa9dd2 Mon Sep 17 00:00:00 2001
 From: Jack Ding <jack.ding@windriver.com>
 Date: Fri, 11 May 2018 21:45:14 -0400
 Subject: [PATCH 2/3] update memcached dependency
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] update memcached dependency
  1 file changed, 6 insertions(+)
 
 diff --git a/SPECS/puppet-horizon.spec b/SPECS/puppet-horizon.spec
-index 03ed102..6ad467c 100644
+index 511cf25..ada0538 100644
 --- a/SPECS/puppet-horizon.spec
 +++ b/SPECS/puppet-horizon.spec
 @@ -9,6 +9,9 @@ URL:            https://launchpad.net/puppet-horizon
@@ -32,5 +32,5 @@ index 03ed102..6ad467c 100644
  find . -type f -name ".*" -exec rm {} +
  find . -size 0 -exec rm {} +
 -- 
-1.8.3.1
+2.7.4
 

config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/patches/0001-update-memcached-dependency.patch

@@ -1,4 +1,4 @@
-From 0d0409579a7f66fce15375a8193d17d7d7bd130e Mon Sep 17 00:00:00 2001
+From ece3e238c13425113f7882448a0e0fe40d07637c Mon Sep 17 00:00:00 2001
 From: Jack Ding <jack.ding@windriver.com>
 Date: Fri, 11 May 2018 21:45:24 -0400
 Subject: [PATCH 3/3] update memcached dependency
@@ -8,10 +8,10 @@ Subject: [PATCH 3/3] update memcached dependency
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/metadata.json b/metadata.json
-index cc20f92..df162ac 100644
+index 222be17..a9d8a91 100644
 --- a/metadata.json
 +++ b/metadata.json
-@@ -49,6 +49,6 @@
+@@ -47,6 +47,6 @@
    "dependencies": [
      {"name":"puppetlabs/apache","version_requirement":">=1.2.0 <2.0.0"},
      {"name":"puppetlabs/stdlib","version_requirement":">=4.0.0 <5.0.0"},
@@ -20,5 +20,5 @@ index cc20f92..df162ac 100644
    ]
  }
 -- 
-1.8.3.1
+2.7.4