0c4b868072
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>
37 lines
964 B
Diff
37 lines
964 B
Diff
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
|
|
|
|
---
|
|
SPECS/puppet-horizon.spec | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/SPECS/puppet-horizon.spec b/SPECS/puppet-horizon.spec
|
|
index 511cf25..ada0538 100644
|
|
--- a/SPECS/puppet-horizon.spec
|
|
+++ b/SPECS/puppet-horizon.spec
|
|
@@ -9,6 +9,9 @@ URL: https://launchpad.net/puppet-horizon
|
|
|
|
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
|
|
|
|
+# WRS Patches
|
|
+Patch0001: 0001-update-memcached-dependency.patch
|
|
+
|
|
BuildArch: noarch
|
|
|
|
Requires: puppet-apache
|
|
@@ -21,6 +24,9 @@ Puppet module for OpenStack Horizon
|
|
|
|
%prep
|
|
%setup -q -n openstack-horizon-%{upstream_version}
|
|
+# WRS Patches
|
|
+%patch0001 -p1
|
|
+
|
|
|
|
find . -type f -name ".*" -exec rm {} +
|
|
find . -size 0 -exec rm {} +
|
|
--
|
|
2.7.4
|
|
|