From 3bd5cf3d29382a332c4b5fec3d12500146ecb89f Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 17 Oct 2017 12:55:38 +0200 Subject: [PATCH] Define glibc_release_url based on glibcsrcdir, not glibcversion The former is more reliable because glibcsrcdir changes in case of a release off the release/*/master branch (which does not have a tarball), but glibcversion remains the same. --- glibc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glibc.spec b/glibc.spec index 52e09de..b86d045 100644 --- a/glibc.spec +++ b/glibc.spec @@ -9,8 +9,8 @@ # gzip -9 $(git describe --match 'glibc-*').tar # # glibc_release_url is only defined when we have a release tarball. -%{lua: if not string.match(rpm.expand("%glibcversion"), "%.*.90$") then - rpm.define("glibc_release_url http://ftp.gnu.org/gnu/glibc/") end} +%{lua: if string.match(rpm.expand("%glibcsrcdir"), "^glibc%-[0-9.]+$") then + rpm.define("glibc_release_url https://ftp.gnu.org/gnu/glibc/") end} ############################################################################## # We support hte following options: # --with/--without,