From ab72fd8d8256e6e79698173fb175d665113c1444 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Nov 05 2018 01:31:24 +0000 Subject: Manual CentOS Debranding --- diff --git a/SOURCES/centos-branding-yum.patch b/SOURCES/centos-branding-yum.patch new file mode 100644 index 0000000..f100222 --- /dev/null +++ b/SOURCES/centos-branding-yum.patch @@ -0,0 +1,37 @@ +diff -uNrp yum-3.4.3.orig/yum/constants.py yum-3.4.3/yum/constants.py +--- yum-3.4.3.orig/yum/constants.py 2018-01-30 11:17:56.961899488 +0000 ++++ yum-3.4.3/yum/constants.py 2018-01-30 11:41:57.421866122 +0000 +@@ -123,22 +123,22 @@ REPO_PROBLEM_PACKAGE=5 + + + ERRORS_TO_KBASE_ARTICLES = { +- 404: """To address this issue please refer to the below knowledge base article ++ 404: """To address this issue please refer to the below wiki article + +-https://access.redhat.com/articles/1320623 ++https://wiki.centos.org/yum-errors + +-If above article doesn't help to resolve this issue please open a ticket with Red Hat Support. ++If above article doesn't help to resolve this issue please use https://bugs.centos.org/. + """, +- 403: """To address this issue please refer to the below knowledge base article ++ 403: """To address this issue please refer to the below wiki article + +-https://access.redhat.com/solutions/69319 ++https://wiki.centos.org/yum-errors + +-If above article doesn't help to resolve this issue please open a ticket with Red Hat Support. ++If above article doesn't help to resolve this issue please use https://bugs.centos.org/. + """, +- 60: """It was impossible to connect to the Red Hat servers. ++ 60: """It was impossible to connect to the CentOS servers. + This could mean a connectivity issue in your environment, such as the requirement to configure a proxy, + or a transparent proxy that tampers with TLS security, or an incorrect system clock. +-Please collect information about the specific failure that occurs in your environment, +-using the instructions in: https://access.redhat.com/solutions/1527033 and open a ticket with Red Hat Support. ++You can try to solve this issue by using the instructions on https://wiki.centos.org/yum-errors ++If above article doesn't help to resolve this issue please use https://bugs.centos.org/. + """ +-} +\ No newline at end of file ++} diff --git a/SPECS/yum.spec b/SPECS/yum.spec index 199446c..819642a 100644 --- a/SPECS/yum.spec +++ b/SPECS/yum.spec @@ -168,6 +168,9 @@ Patch314: BZ-1481220-print-disk-usage-on-yum-clean-all.patch Patch315: BZ-1480065-depsolve-filter-conflicting-provider.patch Patch316: BZ-1506890-logrotate-change-size-to-maxsize.patch +#CentOS Branding +Patch1000: centos-branding-yum.patch + URL: http://yum.baseurl.org/ BuildArchitectures: noarch BuildRequires: python @@ -419,6 +422,8 @@ Install this package if you want auto yum updates nightly via cron. %patch315 -p1 %patch316 -p1 +%patch1000 -p1 + # Do distro config. changes after everything else. %patch1 -p1 @@ -655,6 +660,7 @@ exit 0 - retain installonly limit of 5 - ensure distrover is always from centos-release - Make yum require yum-plugin-fastestmirror +- add centos-branding-yum.patch * Wed Aug 15 2018 Michal Domonkos - 3.4.3-161 - Improve retry logic for gpg keys