From 19fef1af31ca968e5006ab94a93489ca1afe2fe5 Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno@wolff.to>
Date: Wed, 29 Mar 2023 18:55:56 -0500
Subject: [PATCH] Update for 4.6.1

Only one of the fixes seems to apply to us and shouldn't have
affected composes.
I was also able to simplify the spec file after Phillip modified
the way he tagged releases.
---
 .gitignore          |  1 +
 sources             |  2 +-
 squashfs-tools.spec | 18 ++++++++++--------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index d23bc27..d527b6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ squashfs-4.1.tar.bz2
 /squashfs-tools-aaf011a868c786b06e74cbdaf860d45793939f35.tar.gz
 /squashfs-tools-36abab0ad661247498834c2e7f5e1ec476f2081d.tar.gz
 /squashfs-tools-squashfs-tools-4.6.tar.gz
+/squashfs-tools-4.6.1.tar.gz
diff --git a/sources b/sources
index 0d73970..6f632b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (squashfs-tools-squashfs-tools-4.6.tar.gz) = df3e9bc369995acda49cb6c26802d568ff2ee26dc7e949671809c408e79947bf3e003a9d31aeac6214d29ce5767f604e95673dcf6f88c67e91461b392a4402cf
+SHA512 (squashfs-tools-4.6.1.tar.gz) = 10e8a4b1e2327e062aef4f85860e76ebcd7a29e4c19e152ff7edec4a38316982b5bcfde4ab69da6bcb931258d264c2b6cb40cb5f635f9e6f6eba1ed5976267cb
diff --git a/squashfs-tools.spec b/squashfs-tools.spec
index 1778afa..bec5ca6 100644
--- a/squashfs-tools.spec
+++ b/squashfs-tools.spec
@@ -1,14 +1,9 @@
 Name: squashfs-tools
-Version: 4.6
+Version: 4.6.1
 Summary: Utility for the creation of squashfs filesystems
 %global forgeurl https://github.com/plougher/%{name}
-%global tag %{name}-%{version}
+%global tag %{version}
 %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}
 Source:  %{forgesource}
 # https://github.com/plougher/squashfs-tools/pull/231
@@ -16,7 +11,7 @@ Source:  %{forgesource}
 # https://bugzilla.redhat.com/show_bug.cgi?id=2178510
 # Fix a crash caused by an out-of-bounds access that was inadvertently
 # re-introduced in a memory leak fix
-Release: 2%{dist}
+Release: 1%{dist}
 License: GPLv2+
 
 BuildRequires: make
@@ -59,6 +54,13 @@ make INSTALL_PREFIX=%{buildroot}/usr INSTALL_DIR=%{buildroot}%{_sbindir} INSTALL
 %{_sbindir}/sqfscat
 
 %changelog
+* Wed Mar 29 2023 Bruno Wolff III <bruno@wolff.to> - 4.6.1-1
+- Phillip is now doing two tags per release and we can
+- use the one that works better with forgemeta
+- There are a few fixes after the 4.6 release. I think only
+- one applies to Fedora because of the build options we use.
+- It was not something that affects image builds.
+
 * Fri Mar 17 2023 Bruno Wolff III <bruno@wolff.to> - 4.6-2
 - Remove the dist prefix from the release