rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

use tilde versioning for release candidates

Browse Source 
All supported released of Fedora and EPEL support the tilde notation.

Reference:
https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/
This commit is contained in:
Todd Zullinger 2023-05-12 21:07:56 -04:00
parent b477fc3318
commit d050347835
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
git.spec
View File

@ -73,20 +73,23 @@
# Define %%bash_completions_dir for EL <= 9 # Define %%bash_completions_dir for EL <= 9
%{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions} %{?!bash_completions_dir:%global bash_completions_dir %{_datadir}/bash-completion/completions}
# Define for release candidates # Adjust Source URL path for release candidates
#global rcrev .rc0 %global rcpath %(test "%{version}" = "%{real_version}" || echo testing/)
# Set path to the package-notes linker script # 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 Name: git
Version: 2.40.1 Version: 2.40.1
Release: 1%{?rcrev}%{?dist} Release: 2%{?dist}
Summary: Fast Version Control System 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 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/ 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 C Hamano's key is used to sign git releases, it can be found in the
# junio-gpg-pub tag within git. # junio-gpg-pub tag within git.
@ -516,7 +519,7 @@ Requires: subversion
# Verify GPG signatures # Verify GPG signatures
xz -dc '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data=- 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 print-failed-test-output script
install -p -m 755 %{SOURCE99} print-failed-test-output 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} %{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog %changelog
* Fri May 12 2023 Todd Zullinger <tmz@pobox.com> - 2.40.1-2
- use tilde versioning for release candidates
* Tue Apr 25 2023 Todd Zullinger <tmz@pobox.com> - 2.40.1-1 * Tue Apr 25 2023 Todd Zullinger <tmz@pobox.com> - 2.40.1-1
- update to 2.40.1 (CVE-2023-25652, CVE-2023-25815, CVE-2023-29007) - update to 2.40.1 (CVE-2023-25652, CVE-2023-25815, CVE-2023-29007)