From 9e959bfcf878b4c9533f8377643c72eb1706354e Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Fri, 14 Feb 2020 08:41:08 +0100 Subject: [PATCH 1/2] [CC8] Use default zlib for non-x86_64 archs --- zlib.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/zlib.spec b/zlib.spec index a84e810d8c0..3aa4269501c 100644 --- a/zlib.spec +++ b/zlib.spec @@ -1,7 +1,13 @@ ### RPM external zlib 1.2.11 ++%ifarch x86_64 %define git_repo cms-externals -%define git_branch cms/v1.2.11 +%define git_branch cms/v%{realversion} %define git_commit 822f7f5a8c57802faf8bbfe16266be02eff8c2e2 +%else +%define git_repo madler +%define git_branch master +%define git_commit v%{realversion} +%endif Source0: git://github.com/%{git_repo}/zlib.git?obj=%{git_branch}/%{git_commit}&export=zlib-%{realversion}&output=/zlib-%{realversion}.tgz %prep From 4ac0760915ca877ab2f5aae087fb758ceb6235b5 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Fri, 14 Feb 2020 09:04:21 +0100 Subject: [PATCH 2/2] Update zlib.spec --- zlib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zlib.spec b/zlib.spec index 3aa4269501c..837e0d54b6a 100644 --- a/zlib.spec +++ b/zlib.spec @@ -1,5 +1,5 @@ ### RPM external zlib 1.2.11 -+%ifarch x86_64 +%ifarch x86_64 %define git_repo cms-externals %define git_branch cms/v%{realversion} %define git_commit 822f7f5a8c57802faf8bbfe16266be02eff8c2e2