integ/base/openssh/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
slin14 898bc83a8e remove paired patches in openssh
"spec-remove-TC-config-files.patch" revert "spec-includes-TiS-config-files.patch"
So we could remove them together.

Story: 2004135
Task: 27604

Change-Id: I1609dd908731b4975667e5de310cd2d3c303da7f
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-10-23 02:57:38 +08:00

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
@@ -346,7 +346,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