From 22833277e67bd7f5a58300492e03059edbe03076 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 26 May 2018 11:59:04 +0200 Subject: [PATCH] supplying %date for %forge macros optional (backwards compatible) --- macros.forge | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/macros.forge b/macros.forge index 17efa3f..fd703a1 100644 --- a/macros.forge +++ b/macros.forge @@ -8,7 +8,7 @@ # Version if applicable, set it with Version: # tag if applicable # commit if applicable -# date if applicable +# date if applicable (to override the mtime of the Source archive) # # The macro will attempt to compute and set the following variables if they are # not already set by the packager: @@ -256,7 +256,7 @@ if (distprefix == "") then distprefix = string.sub(rpm.expand("%{?commit}"), 1, 7) end if (distprefix ~= "") then - local dist = ".%{date}.%{scm}" .. string.gsub(distprefix, "-",".") .. rpm.expand("%{?dist}") + local dist = ".%{?date}%{!?date:%([ -r %{_sourcedir}/%{archivename}.%{archiveext} ] && date +%Y%m%d -u -r %{_sourcedir}/%{archivename}.%{archiveext})}.%{scm}" .. string.gsub(distprefix, "-",".") .. rpm.expand("%{?dist}") explicitset("dist", dist) end -- Final spec variable summary if the macro was called with -i @@ -272,7 +272,7 @@ if informative then rpm.expand("%{echo: scm: %{?scm}\\n}") rpm.expand("%{echo: tag: %{?tag}\\n}") rpm.expand("%{echo: commit: %{?commit}\\n}") - rpm.expand("%{echo: dist: %{?dist}\\n}") + rpm.expand("%{echo: dist: %{?dist} (snapshot date is either manually supplied or computed once %%{_sourcedir}/%%{archivename}.%%{archiveext} is available)\\n}") end } @@ -280,4 +280,4 @@ end %forgesetup(a:b:cDn:Tq) %setup %{?forgesetupargs} %{-a} %{-b} %{-c} %{-D} %{-n} %{-T} %{-q} # Convenience macro to relay computed arguments to %autosetup -%forgeautosetup(a:b:cDn:TvNS:p:) %autosetup %{?forgesetupargs} %{-a} %{-b} %{-c} %{-D} %{-n} %{-T} %{-v} %{-N} %{-S} %{-p} \ No newline at end of file +%forgeautosetup(a:b:cDn:TvNS:p:) %autosetup %{?forgesetupargs} %{-a} %{-b} %{-c} %{-D} %{-n} %{-T} %{-v} %{-N} %{-S} %{-p}