From a69019b173f8f702572fbee1281b74375fa3fe59 Mon Sep 17 00:00:00 2001 From: zhipengl Date: Wed, 22 Aug 2018 23:38:21 +0800 Subject: [PATCH] upgrade rsync to CentOS 7.5 version Story: 2003389 Task: 24487 Depends-On: https://review.openstack.org/#/c/595404/ Change-Id: I80c0279848076ec7b2889b98c7221b7067b5f79f Signed-off-by: zhipengl --- ...-Update-package-versioning-for-TIS-format.patch | 14 +++++++------- base/rsync/centos/srpm_path | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index ca0acc301..16dd763e5 100644 --- a/base/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/base/rsync/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -1,7 +1,7 @@ -From 20f4e2f0f19c6d0e9c8ee1314481bc8e85dbd5bb Mon Sep 17 00:00:00 2001 +From a6709dfc64368bac4970e3b99512a4e1b4b8e756 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 16:32:24 -0400 -Subject: [PATCH 1/1] WRS: 0001-Update-package-versioning-for-TIS-format.patch +Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch Conflicts: SPECS/rsync.spec @@ -10,18 +10,18 @@ Conflicts: 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/rsync.spec b/SPECS/rsync.spec -index 85b01f2..310b284 100644 +index d5f6d55..d9cb5ed 100644 --- a/SPECS/rsync.spec +++ b/SPECS/rsync.spec @@ -8,7 +8,7 @@ Summary: A program for synchronizing files over a network Name: rsync - Version: 3.0.9 --Release: 18%{?prerelease}%{?dist} -+Release: 18.el7%{?_tis_dist}.%{tis_patch_ver} + Version: 3.1.2 +-Release: 4%{?prerelease}%{?dist} ++Release: 4.el7%{?_tis_dist}.%{tis_patch_ver} Group: Applications/Internet URL: http://rsync.samba.org/ -- -1.9.1 +2.7.4 diff --git a/base/rsync/centos/srpm_path b/base/rsync/centos/srpm_path index 1780040a7..211d97f95 100644 --- a/base/rsync/centos/srpm_path +++ b/base/rsync/centos/srpm_path @@ -1 +1 @@ -mirror:Source/rsync-3.0.9-18.el7.src.rpm +mirror:Source/rsync-3.1.2-4.el7.src.rpm