From 62f68d9712621a1aec6eb55bf0eecd45c3dc8f25 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Mon, 5 Mar 2018 08:37:00 +1100 Subject: The libexpat project has moved to github. Fetch expat from github. Closes #3316 --- bare/config/devel/expat-2.1.0-1.cfg | 5 +++-- source-builder/config/expat-2-1.cfg | 2 +- source-builder/sb/download.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bare/config/devel/expat-2.1.0-1.cfg b/bare/config/devel/expat-2.1.0-1.cfg index fcb7cbe..90f2ce8 100644 --- a/bare/config/devel/expat-2.1.0-1.cfg +++ b/bare/config/devel/expat-2.1.0-1.cfg @@ -8,9 +8,10 @@ %include %{_configdir}/base.cfg -%define expat_version 2.1.0 +%define expat_version 2.1.0 +%define expat_version_dir R_2_1_0 -%hash md5 expat-%{expat_version}.tar.gz dd7dab7a5fea97d2a6a43f511449b7cd +%hash sha256 expat-%{expat_version}.tar.gz 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86 # # The Expat build instructions. We use 2.xx Release 1. diff --git a/source-builder/config/expat-2-1.cfg b/source-builder/config/expat-2-1.cfg index 589bc86..77774e7 100644 --- a/source-builder/config/expat-2-1.cfg +++ b/source-builder/config/expat-2-1.cfg @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) # # Source # -%source set expat http://downloads.sourceforge.net/project/expat/expat/%{expat_version}/expat-%{expat_version}.tar.gz +%source set expat https://github.com/libexpat/libexpat/releases/download/%{expat_version_dir}/expat-%{expat_version}.tar.gz # # Prepare the source code. diff --git a/source-builder/sb/download.py b/source-builder/sb/download.py index 6c2593f..f8dd305 100644 --- a/source-builder/sb/download.py +++ b/source-builder/sb/download.py @@ -71,7 +71,7 @@ def _humanize_bytes(bytes, precision = 1): return '%.*f%s' % (precision, float(bytes) / factor, suffix) def _sensible_url(url, used = 0): - space = 200 + space = 100 if len(url) > space: size = int(space - 14) url = url[:size] + '...' -- cgit v1.2.3