From 8a19df627b4a7cafa18f5ff0880c48a0ee15812e Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Sat, 4 Nov 2023 05:01:15 +0000 Subject: [PATCH] Drop %%_zig_version macro As discussed in https://bugzilla.redhat.com/show_bug.cgi?id=2142363#c5 --- macros.zig | 1 - zig.spec | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/macros.zig b/macros.zig index 4aacbc5..0b2b767 100644 --- a/macros.zig +++ b/macros.zig @@ -1,6 +1,5 @@ %zig_arches x86_64 aarch64 riscv64 %{mips64} -%_zig_version @@ZIG_VERSION@@ %zig /usr/bin/zig # expected features for each arch when targeting baseline diff --git a/zig.spec b/zig.spec index 7447d61..1889491 100644 --- a/zig.spec +++ b/zig.spec @@ -44,7 +44,7 @@ BuildRequires: help2man # for signature verification BuildRequires: minisign -%if %{with macro} || 0%{?llvm_compat} +%if 0%{?llvm_compat} BuildRequires: sed %endif @@ -143,7 +143,6 @@ install -D -pv -m 0644 -t %{buildroot}%{_mandir}/man1/ %{name}.1 %if %{with macro} install -D -pv -m 0644 %{SOURCE2} %{buildroot}%{_rpmmacrodir}/macros.%{name} -sed -i -e "s|@@ZIG_VERSION@@|%{version}|" %{buildroot}%{_rpmmacrodir}/macros.%{name} %endif %if %{with test} @@ -174,6 +173,7 @@ sed -i -e "s|@@ZIG_VERSION@@|%{version}|" %{buildroot}%{_rpmmacrodir}/macros.%{ * Thu Oct 19 2023 Aleksei Bavshin - 0.9.1-5 - Fix build with `--without macro` - Skip %%check and test dependencies when tests are disabled +- Drop %%_zig_version macro * Thu Oct 19 2023 Benson Muite - 0.9.1-5 - Verify source signature