From 7a2518287bd7d1f35d2b95797c6916f850712118 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Sep 03 2019 21:55:13 +0000 Subject: RPM macros: Redefining %fedora now changes %dist To get a deterministic NEVR including the dist tag on a different release, it used to be enough to call `rpm` with: --define 'dist .fcXX' Later it got more complicated: --define 'dist %{?distprefix}.fcXX%{?with_bootstrap:~bootstrap}' And now it is even more complicated: --define 'dist %{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.fcXX%{?with_bootstrap:~bootstrap}' It becomes more and more tedious. This change makes it possible to do this instead: --define 'fedora XX' Signed-off-by: There is nothing to sign --- diff --git a/fedora-release.spec b/fedora-release.spec index bdc3129..505d69e 100644 --- a/fedora-release.spec +++ b/fedora-release.spec @@ -14,7 +14,7 @@ Summary: Fedora release files Name: fedora-release Version: 32 -Release: 0.1 +Release: 0.2 License: MIT URL: https://fedoraproject.org/ @@ -481,7 +481,7 @@ cat >> %{buildroot}%{_rpmconfigdir}/macros.d/macros.dist << EOF %%fedora %{dist_version} %%__bootstrap ~bootstrap -%%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.fc%{dist_version}%%{?with_bootstrap:%{__bootstrap}} +%%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.fc%%{fedora}%%{?with_bootstrap:%{__bootstrap}} %%fc%{dist_version} 1 EOF @@ -642,6 +642,9 @@ echo _DISABLED_ > %{buildroot}%{_prefix}/lib/variant %changelog +* Thu Aug 15 2019 Miro Hrončok - 32-0.2 +- RPM macros: Redefining %%fedora now changes %%dist + * Tue Aug 13 2019 Mohan Boddu - 32-0.1 - Setup for rawhide being F32 - Disable zram-swap service (sgallagh)