From d050347835c141152fe4e78cdb3a9d7c849cff9b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 12 May 2023 21:07:56 -0400 Subject: [PATCH] use tilde versioning for release candidates All supported released of Fedora and EPEL support the tilde notation. Reference: https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/ --- git.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/git.spec b/git.spec index 2e013b3..c778286 100644 --- a/git.spec +++ b/git.spec @@ -73,20 +73,23 @@ # Define %%bash_completions_dir for EL <= 9 %{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} -# Define for release candidates -#global rcrev .rc0 +# 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}-%{version}%{?rcrev}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld +%global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld Name: git Version: 2.40.1 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT URL: https://git-scm.com/ -Source0: https://www.kernel.org/pub/software/scm/git/%{?rcrev:testing/}%{name}-%{version}%{?rcrev}.tar.xz -Source1: https://www.kernel.org/pub/software/scm/git/%{?rcrev:testing/}%{name}-%{version}%{?rcrev}.tar.sign + +# Note: real_version must be defined _after_ Version +%global real_version %(echo %{version} | tr '~' '.') +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 # Junio C Hamano's key is used to sign git releases, it can be found in the # junio-gpg-pub tag within git. @@ -516,7 +519,7 @@ Requires: subversion # Verify GPG signatures xz -dc '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data=- -%autosetup -p1 -n %{name}-%{version}%{?rcrev} +%autosetup -p1 -n %{name}-%{real_version} # Install print-failed-test-output script install -p -m 755 %{SOURCE99} print-failed-test-output @@ -1035,6 +1038,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Fri May 12 2023 Todd Zullinger - 2.40.1-2 +- use tilde versioning for release candidates + * Tue Apr 25 2023 Todd Zullinger - 2.40.1-1 - update to 2.40.1 (CVE-2023-25652, CVE-2023-25815, CVE-2023-29007)