From bae778cbc1db8aa2dad565de1f968c6677aafa06 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 1 Jun 2023 10:20:55 -0400 Subject: [PATCH] fix Source URL handling Move %rcpath definition added d050347 (use tilde versioning for release candidates, 2023-05-12) after %real_version. Otherwise, it is not parsed correctly. (I'm pretty sure it worked in the past, but it certainly doesn't now.) --- git.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index 784a2e4..1488eb3 100644 --- a/git.spec +++ b/git.spec @@ -73,9 +73,6 @@ # Define %%bash_completions_dir for EL <= 9 %{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} -# Adjust Source URL path for release candidates -%global rcpath %(test "%{version}" = "%{real_version}" || echo testing/) - # Set path to the package-notes linker script %global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld @@ -88,6 +85,10 @@ URL: https://git-scm.com/ # Note: real_version must be defined _after_ Version %global real_version %(echo %{version} | tr '~' '.') + +# Adjust Source URL path for release candidates +%global rcpath %(test "%{version}" = "%{real_version}" || echo testing/) + Source0: https://www.kernel.org/pub/software/scm/git/%{rcpath}%{name}-%{real_version}.tar.xz Source1: https://www.kernel.org/pub/software/scm/git/%{rcpath}%{name}-%{real_version}.tar.sign