Remove dist prefix from the release

Upstream used a different naming scheme for the release to solve
someone else's problem. That required us to tweak how we used
forgemeta to use the matching archive naming. The fix for that
triggered adding the tag to the release which I didn't want for
rpms based off of an actual release. So a second tweak was done
to fix that.
This commit is contained in:
Bruno Wolff III 2023-03-17 19:05:01 -05:00
parent edbe07b14f
commit 6a1ea5214e

View File

@ -2,9 +2,13 @@ Name: squashfs-tools
Version: 4.6 Version: 4.6
Summary: Utility for the creation of squashfs filesystems Summary: Utility for the creation of squashfs filesystems
%global forgeurl https://github.com/plougher/%{name} %global forgeurl https://github.com/plougher/%{name}
%global date 20230317
%global tag %{name}-%{version} %global tag %{name}-%{version}
%forgemeta %forgemeta
# Upstream used a different naming scheme for the release to help
# someone else out. That required us to set a tag to correctly get
# the release file correct. However it also caused the tag to be
# used in the version, which we don't want when based on a release.
%undefine distprefix
URL: %{forgeurl} URL: %{forgeurl}
Source: %{forgesource} Source: %{forgesource}
# https://github.com/plougher/squashfs-tools/pull/231 # https://github.com/plougher/squashfs-tools/pull/231
@ -12,7 +16,7 @@ Source: %{forgesource}
# https://bugzilla.redhat.com/show_bug.cgi?id=2178510 # https://bugzilla.redhat.com/show_bug.cgi?id=2178510
# Fix a crash caused by an out-of-bounds access that was inadvertently # Fix a crash caused by an out-of-bounds access that was inadvertently
# re-introduced in a memory leak fix # re-introduced in a memory leak fix
Release: 1%{dist} Release: 2%{dist}
License: GPLv2+ License: GPLv2+
BuildRequires: make BuildRequires: make
@ -55,6 +59,9 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL
%{_sbindir}/sqfscat %{_sbindir}/sqfscat
%changelog %changelog
* Fri Mar 17 2023 Bruno Wolff III <bruno@wolff.to> - 4.6-2
- Remove the dist prefix from the release
* Fri Mar 17 2023 Bruno Wolff III <bruno@wolff.to> - 4.6-1 * Fri Mar 17 2023 Bruno Wolff III <bruno@wolff.to> - 4.6-1
- 4.6 release - 4.6 release
- PR #231 was merged - PR #231 was merged