diff --git a/anda/langs/zig/bootstrap/setup.sh b/anda/langs/zig/bootstrap/setup.sh index d8068c74ea..6f3634ddf4 100755 --- a/anda/langs/zig/bootstrap/setup.sh +++ b/anda/langs/zig/bootstrap/setup.sh @@ -21,8 +21,8 @@ if [ "$1" == "fetch" ]; then randomize_mirrors done echo -e "\033[0;32mNote:\033[0m Selected mirror $mirror" - curl -A "rpmdev-spectool" -H "Accept-Encoding: identity" -O ${mirror}/zig-${version}.tar.xz - curl -A "rpmdev-spectool" -H "Accept-Encoding: identity" -O ${mirror}/zig-${version}.tar.xz.minisig + curl -A "rpmdev-spectool" -H "Accept-Encoding: identity" -O ${mirror}/zig-${version}.tar.xz?source=terra.fyralabs.com + curl -A "rpmdev-spectool" -H "Accept-Encoding: identity" -O ${mirror}/zig-${version}.tar.xz.minisig?source=terra.fyralabs.com elif [ "$1" == "version" ]; then echo $version # Grab a random mirror. For debugging purposes. diff --git a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec index 494ad3de97..2ede49de98 100644 --- a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec +++ b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec @@ -11,6 +11,7 @@ %bcond bootstrap 1 %bcond docs %{without bootstrap} %bcond test 1 +%global archive_name zig-%{ver}.tar.xz %global zig_cache_dir %{builddir}/zig-cache %global zig_build_options %{shrink: \ --verbose \ @@ -43,8 +44,8 @@ Release: 1%?dist Summary: Bootstrapped build of Zig from master. License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 URL: https://ziglang.org -Source0: zig-%{version_no_tilde}.tar.xz -Source1: zig-%{version_no_tilde}.tar.xz.minisig +Source0: %{archive_name} +Source1: %{archive_name}.minisig Patch0: 0000-remove-native-lib-directories-from-rpath.patch Patch3: 0005-link.Elf-add-root-directory-of-libraries-to-linker-p.patch BuildRequires: cmake @@ -105,7 +106,7 @@ BuildArch: noarch Zig Standard Library %prep -/usr/bin/minisign -V -m %{SOURCE0} -x %{SOURCE1} -P %{public_key} +/usr/bin/minisign -V -m %{SOURCE0} -x %{SOURCE1} -P %{public_key} | grep -F -C5 "file:%{archive_name}" || exit 1 %autosetup -p1 -n zig-%{ver} %if %{without bootstrap} # Ensure that the pre-build stage1 binary is not used diff --git a/anda/langs/zig/master/zig-master.spec b/anda/langs/zig/master/zig-master.spec index bd2879a1af..d6af6c90d4 100644 --- a/anda/langs/zig/master/zig-master.spec +++ b/anda/langs/zig/master/zig-master.spec @@ -18,8 +18,9 @@ Release: 2%?dist Summary: Master builds of the Zig language License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 URL: https://ziglang.org -Source0: zig-%{version_no_tilde}.tar.xz -Source1: zig-%{version_no_tilde}.tar.xz.minisig +%global archive_name zig-%{version_no_tilde}.tar.xz +Source0: %{archive_name} +Source1: %{archive_name}.minisig Patch0: 0000-remove-native-lib-directories-from-rpath.patch Patch3: 0005-link.Elf-add-root-directory-of-libraries-to-linker-p.patch BuildRequires: cmake @@ -117,7 +118,7 @@ Documentation for Zig. For more information, visit %{url} %endif %prep -/usr/bin/minisign -V -m %{SOURCE0} -x %{SOURCE1} -P %{public_key} +/usr/bin/minisign -V -m %{SOURCE0} -x %{SOURCE1} -P %{public_key} | grep -F -C5 "file:%{archive_name}" || exit 1 %autosetup -p1 -n zig-%{version_no_tilde} %if %{without bootstrap} # Ensure that the pre-build stage1 binary is not used