84c6cae443
When do Centos 7.5 upgraded, some patches didn't resolve and cause the fuzzy in the line numbers of the patches. And it may cause .orig file is created when do patch. And this .orig file will lead to rpm packaging failure due to the unexpected and unpackaged .orig file. Please visit below link to get more detail info: https://bugs.launchpad.net/starlingx/+bug/1794611 Solution: Safest solution is to de-fuzz our patches. Story: 2003389 Task: 26755 Change-Id: I0a701722187a3fd34ad710c86dbcf31318fbfda5 Signed-off-by: slin14 <shuicheng.lin@intel.com>
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 4da56227f47a96f37eb0e46e0222f7e1d2f95c2b Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 15:32:16 -0400
|
|
Subject: [3/6] WRS: 0001-Update-package-versioning-for-TIS-format.patch
|
|
|
|
---
|
|
SPECS/openssh.spec | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec
|
|
index d10e73e..be83a63 100644
|
|
--- a/SPECS/openssh.spec
|
|
+++ b/SPECS/openssh.spec
|
|
@@ -71,7 +71,7 @@
|
|
Summary: An open source implementation of SSH protocol versions 1 and 2
|
|
Name: openssh
|
|
Version: %{openssh_ver}
|
|
-Release: %{openssh_rel}%{?dist}%{?rescue_rel}
|
|
+Release: %{openssh_rel}.el7_4%{?_tis_dist}.%{tis_patch_ver}
|
|
URL: http://www.openssh.com/portable.html
|
|
#URL1: http://pamsshagentauth.sourceforge.net
|
|
Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
|
|
@@ -350,7 +350,7 @@ Requires: openssh = %{version}-%{release}
|
|
Summary: PAM module for authentication with ssh-agent
|
|
Group: System Environment/Base
|
|
Version: %{pam_ssh_agent_ver}
|
|
-Release: %{pam_ssh_agent_rel}.%{openssh_rel}%{?dist}%{?rescue_rel}
|
|
+Release: %{pam_ssh_agent_rel}.el7_2%{?_tis_dist}.%{tis_patch_ver}
|
|
License: BSD
|
|
|
|
%description
|
|
--
|
|
2.7.4
|
|
|