https://bugzilla.redhat.com/show_bug.cgi?id=2272140 --- Comment #19 from Carl George 🤠 <carl@xxxxxxxxxx> --- Now that the version corresponds to an upstream git tag, that should be used for the tarball. -Source0: https://github.com/pop-os/cosmic-term/archive/%{commit}/cosmic-term-%{shortcommit}.tar.gz +Source0: https://github.com/pop-os/cosmic-term/archive/epoch-%{version_no_tilde}/cosmic-term-%{version_no_tilde}.tar.gz -%autosetup -n %{crate}-%{commit} -p1 -a1 +%autosetup -n cosmic-term-epoch-%{version_no_tilde} -p1 -a1 ================================================================================ The vendor tarball and config can also use the same reference. -# * cargo vendor > vendor-config-%%{shortcommit}.toml -# * tar -pczf vendor-%%{shortcommit}.tar.gz vendor -Source1: vendor-%{shortcommit}.tar.gz -# * mv vendor-config-%%{shortcommit}.toml .. -Source2: vendor-config-%{shortcommit}.toml +# * cargo vendor > vendor-config-%%{version_no_tilde}.toml +# * tar -pczf vendor-%%{version_no_tilde}.tar.gz vendor +Source1: vendor-%{version_no_tilde}.tar.gz +# * mv vendor-config-%%{version_no_tilde}.toml .. +Source2: vendor-config-%{version_no_tilde}.toml ================================================================================ The commitdate macro is not being used, and after the changes above the shortcommit macro will not be used either. They can be removed. Per our conversation in the chat, building this software still requires setting the VERGEN_GIT_* environment variables, so it makes sense to keep the commit and commitdatestring macros. To avoid confusion for other packagers that might need to modify this spec file in the future, I recommend adding a comment above those macros explaining why they are needed in spite of using a tag for the version. +# While our version corresponds to an upstream tag, we still need to define +# these macros in order to set the VERGEN_GIT_SHA and VERGEN_GIT_COMMIT_DATE +# environment variables in multiple sections of the spec file. %global commit 2e2a2376dfe0c6959e4e7d115f7b7d19405737ad -%global shortcommit %{sub %{commit} 1 7} %global commitdatestring 2024-09-24 09:25:39 -0600 -%global commitdate 20240924 ================================================================================ The license string has a few duplicates that need to be combined. (Apache-2.0 OR MIT) (Apache-2.0 OR MIT) (MIT OR Apache-2.0) (MIT OR Apache-2.0 OR Zlib) (MIT OR Zlib OR Apache-2.0) (Zlib OR Apache-2.0 OR MIT) It may help to keep this string sorted to keep an eye on duplicates like this. -- You are receiving this mail because: You are on the CC list for the bug. You are always notified about changes to this product and component https://bugzilla.redhat.com/show_bug.cgi?id=2272140 Report this comment as SPAM: https://bugzilla.redhat.com/enter_bug.cgi?product=Bugzilla&format=report-spam&short_desc=Report%20of%20Bug%202272140%23c19 -- _______________________________________________ package-review mailing list -- package-review@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to package-review-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/package-review@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
