diff --git a/base/centos-release/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/centos-release/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 023e4013d..bf4fc4ba2 100644 --- a/base/centos-release/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/base/centos-release/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -1,4 +1,4 @@ -From d5890a17f5b07a9d17665c2b4138bb244ab6c680 Mon Sep 17 00:00:00 2001 +From 328f19996b93b5be5cd856e600111d0dc87c8616 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 14:58:59 -0400 Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch @@ -8,18 +8,18 @@ Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec -index be95b1b..91dad61 100644 +index ce64be4..8c05c28 100644 --- a/SPECS/centos-release.spec +++ b/SPECS/centos-release.spec -@@ -13,7 +13,7 @@ +@@ -14,7 +14,7 @@ Name: centos-release Version: %{base_release_version} --Release: %{centos_rel}%{?dist} -+Release: %{centos_rel}.el7.centos%{?_tis_dist}.%{tis_patch_ver} +-Release: %{centos_rel}.1%{?dist} ++Release: %{centos_rel}.1.el7.centos%{?_tis_dist}.%{tis_patch_ver} Summary: %{product_family} release file Group: System Environment/Base License: GPLv2 -- -1.9.1 +2.7.4 diff --git a/base/centos-release/centos/meta_patches/centos-release-include-TiS-changes.patch b/base/centos-release/centos/meta_patches/centos-release-include-TiS-changes.patch index 6e0f39d2c..d8df65e2d 100644 --- a/base/centos-release/centos/meta_patches/centos-release-include-TiS-changes.patch +++ b/base/centos-release/centos/meta_patches/centos-release-include-TiS-changes.patch @@ -1,4 +1,4 @@ -From 4905ace48eb3feae48a02d2bd61e3778f8062532 Mon Sep 17 00:00:00 2001 +From e18f905977fa94fa20a2d9a9cc565dc8d7fe8dac Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 14:58:59 -0400 Subject: [PATCH 1/2] WRS: centos-release-include-TiS-changes.patch @@ -8,10 +8,10 @@ Subject: [PATCH 1/2] WRS: centos-release-include-TiS-changes.patch 1 file changed, 8 insertions(+) diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec -index af82c8b..be95b1b 100644 +index 67f1550..ce64be4 100644 --- a/SPECS/centos-release.spec +++ b/SPECS/centos-release.spec -@@ -25,6 +25,8 @@ Provides: system-release(releasever) = %{base_release_version} +@@ -27,6 +27,8 @@ Provides: system-release(releasever) = %{base_release_version} Source0: centos-release-%{base_release_version}-%{centos_rel}.tar.gz Source1: 85-display-manager.preset Source2: 90-default.preset @@ -20,9 +20,9 @@ index af82c8b..be95b1b 100644 %description %{product_family} release files -@@ -118,6 +120,12 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset/ - install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system-preset/ - install -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/system-preset/ +@@ -123,6 +125,12 @@ install -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/system-preset/ + %posttrans + /usr/bin/uname -m | grep -q 'x86_64' && echo 'centos' >/etc/yum/vars/contentdir || echo 'altarch' > /etc/yum/vars/contentdir +# Overwrite default issue files with cgcs related files. +install -m 0644 %{SOURCE3} %{buildroot}/etc/issue @@ -34,5 +34,5 @@ index af82c8b..be95b1b 100644 %clean rm -rf %{buildroot} -- -1.9.1 +2.7.4 diff --git a/base/centos-release/centos/srpm_path b/base/centos-release/centos/srpm_path index 7127b6ab7..199b5f4be 100644 --- a/base/centos-release/centos/srpm_path +++ b/base/centos-release/centos/srpm_path @@ -1 +1 @@ -mirror:Source/centos-release-7-4.1708.el7.centos.src.rpm +mirror:Source/centos-release-7-5.1804.1.el7.centos.src.rpm