From f09e564ffa9cf968529c87f90abb84f8eb6618ce Mon Sep 17 00:00:00 2001 From: slin14 Date: Tue, 9 Oct 2018 23:00:20 +0800 Subject: [PATCH] de-fuzz facter 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: 26966 Change-Id: I7ec6cfad50a4b88de3f8a989fbe04dea14456114 Signed-off-by: slin14 --- config/facter/centos/patches/0001-ps.patch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/config/facter/centos/patches/0001-ps.patch b/config/facter/centos/patches/0001-ps.patch index b0fa55378..699327f76 100644 --- a/config/facter/centos/patches/0001-ps.patch +++ b/config/facter/centos/patches/0001-ps.patch @@ -1,11 +1,8 @@ ---- - lib/facter/ps.rb | 2 +- - spec/unit/ps_spec.rb | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - +diff --git a/lib/facter/ps.rb b/lib/facter/ps.rb +index 9163519..02117ac 100644 --- a/lib/facter/ps.rb +++ b/lib/facter/ps.rb -@@ -11,7 +11,7 @@ +@@ -12,7 +12,7 @@ # Facter.add(:ps) do @@ -14,6 +11,8 @@ end Facter.add(:ps) do +diff --git a/spec/unit/ps_spec.rb b/spec/unit/ps_spec.rb +index 2e25a4b..20c61af 100755 --- a/spec/unit/ps_spec.rb +++ b/spec/unit/ps_spec.rb @@ -27,9 +27,9 @@ describe "ps facts" do