From 6729dfb4a366ca57a83019df71b4ef7c6a316fe7 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 28 Sep 2022 11:54:40 -0400
Subject: [PATCH 01/28] Drop EPEL conditionals from Fedora branches

---
 advancecomp.spec | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/advancecomp.spec b/advancecomp.spec
index 5610ada..2f2d136 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -36,23 +36,10 @@ BuildRequires:  dos2unix
 # System library supported by upstream
 BuildRequires:  zlib-devel
 
-%if 0%{?el7}
-# No libdeflate package in EPEL7
-Provides:       bundled(libdeflate) = 0.6
-%else
 # Unbundled downstream
 BuildRequires:  pkgconfig(libdeflate)
-%endif
 
-%if 0%{?el9} || 0%{?el8} || 0%{?el7}
-# No libzopfli/zopfli-devel in these distributions
-# Version number based on HISTORY, which mentions that upstream commit
-# 6818a0859063b946094fb6f94732836404a0d89a was used from
-# https://github.com/google/zopfli/.
-Provides:       bundled(zopfli) = 1.0.2%{?!el7:^20160527git6818a08}
-%else
 BuildRequires:  zopfli-devel
-%endif
 
 # From 7z/README:
 #
@@ -91,7 +78,6 @@ This package contains:
 %autosetup -p1
 dos2unix -k doc/*.txt
 
-%if ! 0%{?el7}
 # Patch out bundled libdeflate
 rm -rvf libdeflate
 sed -r -i '/libdeflate[\/_]/d' Makefile.am
@@ -101,9 +87,7 @@ find . -type f -exec gawk \
     '/^[[:blank:]]*#include.*libdeflate/ { print FILENAME; nextfile }' \
     '{}' '+' |
   xargs -r -t sed -r -i 's@^([[:blank:]]*#include.*)libdeflate/@\1@'
-%endif
 
-%if !(0%{?el9} || 0%{?el8} || 0%{?el7})
 # Patch out bundled zopfli
 rm -rvf zopfli
 sed -r -i \
@@ -116,24 +100,19 @@ find . -type f -exec gawk \
     '/^[[:blank:]]*#include.*zopfli/ { print FILENAME; nextfile }' \
     '{}' '+' |
   xargs -r -t sed -r -i -e 's@^([[:blank:]]*#include.*)zopfli/@\1@'
-%endif
 
 
 %build
 %set_build_flags
 autoreconf --force --install --verbose
 
-%if ! 0%{?el7}
 # Link against system libdeflate
 export CFLAGS="$(pkgconf --cflags libdeflate) ${CFLAGS-}"
 export CXXFLAGS="$(pkgconf --cflags libdeflate) ${CXXFLAGS-}"
 export LDFLAGS="$(pkgconf --libs libdeflate) ${LDFLAGS-}"
-%endif
 
-%if !(0%{?el9} || 0%{?el8} || 0%{?el7})
 # Link against system zopfli
 export LDFLAGS="-lzopfli ${LDFLAGS-}"
-%endif
 
 %configure
 %make_build

From 791cf7b520296afd70e1a322d9a7f7c8eeb77b04 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 28 Sep 2022 17:21:51 -0400
Subject: [PATCH 02/28] Stricter file globs

---
 advancecomp.spec | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/advancecomp.spec b/advancecomp.spec
index 2f2d136..3cb9413 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -124,11 +124,13 @@ export LDFLAGS="-lzopfli ${LDFLAGS-}"
 
 %files
 %license COPYING
-%doc AUTHORS HISTORY README
-%doc doc/adv*.txt
+%doc AUTHORS
+%doc HISTORY
+%doc README
+%doc doc/adv{def,mng,png,zip}.txt
 
-%{_bindir}/*
-%{_mandir}/man1/*
+%{_bindir}/adv{def,mng,png,zip}
+%{_mandir}/man1/adv{def,mng,png,zip}.1*
 
 
 %changelog

From 91a8c8347b3ee5ca1d4e84f982e85a769829dd52 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 28 Sep 2022 17:24:48 -0400
Subject: [PATCH 03/28] Add a comment about upstream tests

---
 advancecomp.spec | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/advancecomp.spec b/advancecomp.spec
index 3cb9413..cd174f9 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -122,6 +122,11 @@ export LDFLAGS="-lzopfli ${LDFLAGS-}"
 %make_install
 
 
+# We don’t run upstream tests (%%make_build check) because they are too
+# brittle, expecting recompressed outputs to be identical. Across platforms,
+# compilers, and unbundled library versions, this doesn’t hold up.
+
+
 %files
 %license COPYING
 %doc AUTHORS

From 0ee3b4785e3535117c35af49b0261980c5d3a425 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 29 Sep 2022 08:21:33 -0400
Subject: [PATCH 04/28] =?UTF-8?q?Identify=20bundled=207-Zip=20as=20?=
 =?UTF-8?q?=E2=80=9C7zip=E2=80=9D=20rather=20than=20=E2=80=9C7z=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is closer to the upstream name, to “p7zip”, and to existing usage
in the “retroarch” package.
---
 advancecomp.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/advancecomp.spec b/advancecomp.spec
index cd174f9..29c366a 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -57,7 +57,7 @@ BuildRequires:  zopfli-devel
 # library, and because the implementation is modified, there is no possibility
 # of unbundling. Note that this was forked from the original 7-Zip, not from
 # p7zip.
-Provides:      bundled(7z)
+Provides:      bundled(7zip)
 
 %description
 AdvanceCOMP contains recompression utilities for your .zip archives,

From 649d63913c3cd06d073046f3cce70f9db5bf573f Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 23 Nov 2022 15:45:08 -0500
Subject: [PATCH 05/28] Update to 2.4 (close RHBZ#2145023)

- Security fix for CVE-2022-35014, CVE-2022-35015, CVE-2022-35016,
  CVE-2022-35017, CVE-2022-35018, CVE-2022-35019, CVE-2022-35020
---
 .gitignore       | 1 +
 advancecomp.spec | 2 +-
 sources          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2ec630f..90d97e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ advancecomp-1.15.tar.gz
 /advancecomp-1.23.tar.gz
 /advancecomp-2.1.tar.gz
 /advancecomp-2.3.tar.gz
+/advancecomp-2.4.tar.gz
diff --git a/advancecomp.spec b/advancecomp.spec
index 29c366a..f949b14 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -1,5 +1,5 @@
 Name:           advancecomp
-Version:        2.3
+Version:        2.4
 Release:        %autorelease
 Summary:        Recompression utilities for .png, .mng, .zip and .gz files
 
diff --git a/sources b/sources
index 59b074f..3b60e66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (advancecomp-2.3.tar.gz) = 129bb820a044b03b94d9980c7fc675ee5c273ba8ba84f1fdd341c6b2d9847c3f379cc21e64bb75c0a3c5a45a3df9e560d92143728adb4e8834ae0525ff7d5d1c
+SHA512 (advancecomp-2.4.tar.gz) = 648e89b684725743df4338a0958cdb9c37a7676f4b1a7209d016be0348d089eae9a0d20b3531838fc42887990f4c57749926c27e619887d8106a197961696a06

From e2ff0b6664ef762dafd6965aa6fc6e4fa35c2051 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 18 Jan 2023 21:27:30 +0000
Subject: [PATCH 06/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From 101f35baa06418542e2254b5144b5458f76ca7cf Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Sun, 22 Jan 2023 13:43:51 -0500
Subject: [PATCH 07/28] Update to 2.5 (close RHBZ#2162990; fix RHBZ#2161641)

---
 .gitignore       | 1 +
 advancecomp.spec | 2 +-
 sources          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 90d97e9..91d5d6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ advancecomp-1.15.tar.gz
 /advancecomp-2.1.tar.gz
 /advancecomp-2.3.tar.gz
 /advancecomp-2.4.tar.gz
+/advancecomp-2.5.tar.gz
diff --git a/advancecomp.spec b/advancecomp.spec
index f949b14..4458095 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -1,5 +1,5 @@
 Name:           advancecomp
-Version:        2.4
+Version:        2.5
 Release:        %autorelease
 Summary:        Recompression utilities for .png, .mng, .zip and .gz files
 
diff --git a/sources b/sources
index 3b60e66..04420d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (advancecomp-2.4.tar.gz) = 648e89b684725743df4338a0958cdb9c37a7676f4b1a7209d016be0348d089eae9a0d20b3531838fc42887990f4c57749926c27e619887d8106a197961696a06
+SHA512 (advancecomp-2.5.tar.gz) = c508526415dc002dad442e3f55202494ab2c49ecac3f5ea6e1a3fe27d224dd9a1a33dace02f59c18123d3f4bc74e3f03556b1cff6541cb88dcaaa32ac35c0043

From 824d7ad4cd8ad2962c6dbeafff7a8d4e1c1b219f Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 11 May 2023 10:19:34 -0400
Subject: [PATCH 08/28] Add an rpmlintrc file

---
 advancecomp.rpmlintrc | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 advancecomp.rpmlintrc

diff --git a/advancecomp.rpmlintrc b/advancecomp.rpmlintrc
new file mode 100644
index 0000000..f783f4d
--- /dev/null
+++ b/advancecomp.rpmlintrc
@@ -0,0 +1,4 @@
+# There is really no version information available.
+addFilter(r' unversioned-explicit-provides bundled\(7zip\)')
+# Every RPM has this…
+addFilter(r' strange-permission advancecomp\.spec 600$')

From 6d18adf8196d195f8314f9ab7ec70c0c2581f1f8 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 26 May 2023 09:27:20 -0400
Subject: [PATCH 09/28] Do not number the sole Source

[skip changelog]
---
 advancecomp.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/advancecomp.spec b/advancecomp.spec
index 4458095..a20d937 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -22,7 +22,7 @@ Summary:        Recompression utilities for .png, .mng, .zip and .gz files
 # interpret this as an overall license of GPL-3.0-only.
 License:        GPL-3.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
 URL:            https://www.advancemame.it/
-Source0:        https://github.com/amadvance/advancecomp/archive/v%{version}/advancecomp-%{version}.tar.gz
+Source:         https://github.com/amadvance/advancecomp/archive/v%{version}/advancecomp-%{version}.tar.gz
 
 BuildRequires:  autoconf
 BuildRequires:  automake

From 22e119134b1385cf1751d613e240cca4278a3cd2 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 26 May 2023 09:28:09 -0400
Subject: [PATCH 10/28] Break a long line with a macro

[skip changelog]
---
 advancecomp.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/advancecomp.spec b/advancecomp.spec
index a20d937..838e001 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -22,7 +22,8 @@ Summary:        Recompression utilities for .png, .mng, .zip and .gz files
 # interpret this as an overall license of GPL-3.0-only.
 License:        GPL-3.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
 URL:            https://www.advancemame.it/
-Source:         https://github.com/amadvance/advancecomp/archive/v%{version}/advancecomp-%{version}.tar.gz
+%global forgeurl https://github.com/amadvance/advancecomp
+Source:         %{forgeurl}/archive/v%{version}/advancecomp-%{version}.tar.gz
 
 BuildRequires:  autoconf
 BuildRequires:  automake

From 0d1703faacf46713549472b2b3032547f06537fe Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 26 May 2023 09:29:06 -0400
Subject: [PATCH 11/28] Trivial tidying

[skip changelog]
---
 advancecomp.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/advancecomp.spec b/advancecomp.spec
index 838e001..f117b9f 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -39,7 +39,6 @@ BuildRequires:  zlib-devel
 
 # Unbundled downstream
 BuildRequires:  pkgconfig(libdeflate)
-
 BuildRequires:  zopfli-devel
 
 # From 7z/README:
@@ -76,7 +75,8 @@ This package contains:
 
 
 %prep
-%autosetup -p1
+%autosetup
+
 dos2unix -k doc/*.txt
 
 # Patch out bundled libdeflate

From ab3c30af1ade90349145c7b7755c81c143fca9c4 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Sat, 3 Jun 2023 10:21:50 -0400
Subject: [PATCH 12/28] Remove explicit %set_build_flags, not needed since F36

https://www.fedoraproject.org/wiki/Changes/SetBuildFlagsBuildCheck
---
 advancecomp.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/advancecomp.spec b/advancecomp.spec
index f117b9f..246bda8 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -104,7 +104,6 @@ find . -type f -exec gawk \
 
 
 %build
-%set_build_flags
 autoreconf --force --install --verbose
 
 # Link against system libdeflate

From fcef08707e9d74e5b85c49705ce6534008403be0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 12:58:14 +0000
Subject: [PATCH 13/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From 93f35b31735e4362bcf2129cf03f6d1a6eeaaa8b Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 9 Nov 2023 10:46:52 -0500
Subject: [PATCH 14/28] Update to 2.6 (close RHBZ#2243085)

---
 .gitignore       |  1 +
 advancecomp.spec | 12 ++++++++----
 sources          |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 91d5d6f..6e4a9e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ advancecomp-1.15.tar.gz
 /advancecomp-2.3.tar.gz
 /advancecomp-2.4.tar.gz
 /advancecomp-2.5.tar.gz
+/advancecomp-2.6.tar.gz
diff --git a/advancecomp.spec b/advancecomp.spec
index 246bda8..8866ff3 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -1,5 +1,5 @@
 Name:           advancecomp
-Version:        2.5
+Version:        2.6
 Release:        %autorelease
 Summary:        Recompression utilities for .png, .mng, .zip and .gz files
 
@@ -38,9 +38,13 @@ BuildRequires:  dos2unix
 BuildRequires:  zlib-devel
 
 # Unbundled downstream
-BuildRequires:  pkgconfig(libdeflate)
+BuildRequires:  pkgconfig(libdeflate) >= 1.19
 BuildRequires:  zopfli-devel
 
+# The point of the 2.6 release was to upgrade the bundled libdeflate; enforce
+# this on the unbundled libdeflate.
+Requires:       libdeflate >= 1.19
+
 # From 7z/README:
 #
 #   This directory contains some source files from the
@@ -80,7 +84,7 @@ This package contains:
 dos2unix -k doc/*.txt
 
 # Patch out bundled libdeflate
-rm -rvf libdeflate
+rm -rv libdeflate
 sed -r -i '/libdeflate[\/_]/d' Makefile.am
 # Fix up #include paths. The find-then-modify pattern keeps us from discarding
 # mtimes on any sources that do not need modification.
@@ -90,7 +94,7 @@ find . -type f -exec gawk \
   xargs -r -t sed -r -i 's@^([[:blank:]]*#include.*)libdeflate/@\1@'
 
 # Patch out bundled zopfli
-rm -rvf zopfli
+rm -rv zopfli
 sed -r -i \
     -e '/zopfli[\/_]/d' \
     -e 's/((\(7z_SOURCES\)|WindowOut\.h).*)[[:blank:]]*\\/\1/' \
diff --git a/sources b/sources
index 04420d1..a8812ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (advancecomp-2.5.tar.gz) = c508526415dc002dad442e3f55202494ab2c49ecac3f5ea6e1a3fe27d224dd9a1a33dace02f59c18123d3f4bc74e3f03556b1cff6541cb88dcaaa32ac35c0043
+SHA512 (advancecomp-2.6.tar.gz) = 63cbb0578f96fd3f55ccb49e31bfe945649d36a11558aa482332440943d6d347f161de797b8d4469562b1d551b274c22fe08818179926d56aa4746581d3926dd

From b5dda5d8e28be94d1fd6b0fccb248ee02ca3547e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 12:18:11 +0000
Subject: [PATCH 15/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild


From 97cb7201ea2fb805e1706864b8a66a93ce032f31 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 22:43:47 +0000
Subject: [PATCH 16/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild


From b849bab27f3a01b9e435e96a58835863b29ae492 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 5 Mar 2024 08:55:52 -0500
Subject: [PATCH 17/28] Add an rpmlintrc file

[skip changelog]
---
 advancecomp.rpmlintrc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/advancecomp.rpmlintrc b/advancecomp.rpmlintrc
index f783f4d..483f617 100644
--- a/advancecomp.rpmlintrc
+++ b/advancecomp.rpmlintrc
@@ -1,4 +1,6 @@
-# There is really no version information available.
-addFilter(r' unversioned-explicit-provides bundled\(7zip\)')
-# Every RPM has this…
-addFilter(r' strange-permission advancecomp\.spec 600$')
+# Spec file comment shows that exact version is unknown
+addFilter(r" unversioned-explicit-provides bundled\(7zip\)")
+# Not real spelling errors
+addFilter(r" spelling-error \('[Rr]ecompression',")
+addFilter(r" spelling-error \('([pm]ng|gz)',")
+addFilter(r" spelling-error \('adv(zip|[pm]ng|def)',")

From b5736a5b661e73c265b04ee5547ab6023cf055ff Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 16:39:52 +0000
Subject: [PATCH 18/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild


From 014ec9f6e9b09ea75be27c2b6197a7404843fa0d Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 31 Oct 2024 14:10:42 -0400
Subject: [PATCH 19/28] Invoke autoreconf and configure in %conf rather than in
 %build

---
 advancecomp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/advancecomp.spec b/advancecomp.spec
index 8866ff3..5fcc0ab 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -107,7 +107,7 @@ find . -type f -exec gawk \
   xargs -r -t sed -r -i -e 's@^([[:blank:]]*#include.*)zopfli/@\1@'
 
 
-%build
+%conf
 autoreconf --force --install --verbose
 
 # Link against system libdeflate
@@ -119,6 +119,9 @@ export LDFLAGS="$(pkgconf --libs libdeflate) ${LDFLAGS-}"
 export LDFLAGS="-lzopfli ${LDFLAGS-}"
 
 %configure
+
+
+%build
 %make_build
 
 

From 304257fd2c83b4ba9cdee1a2bced867b6a0e89aa Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 11 Dec 2024 14:03:31 -0500
Subject: [PATCH 20/28] Improve the license-breakdown spec-file comment

---
 advancecomp.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/advancecomp.spec b/advancecomp.spec
index 5fcc0ab..a037ca2 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -14,13 +14,17 @@ Summary:        Recompression utilities for .png, .mng, .zip and .gz files
 #   of the sources that would be covered by the “unRAR license restriction” or
 #   the BSD-3-Clause license for LZFSE are present in this fork.
 #
-#   Certain build-system files, which do not contribute to the license of the
-#   binary RPM, are under other permissible licenses.
-#
 # However, in version 1.17, the COPYING file was updated to GPLv3, with a
 # changelog message (in HISTORY and elsewhere) of “Changes to GPL3.” We
 # interpret this as an overall license of GPL-3.0-only.
 License:        GPL-3.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
+# Additionally, the following bundled libraries are removed in %%prep and do
+# not contribute to the licenses of the binary RPMs:
+#
+# Apache-2.0:
+#   - zopfli/
+# MIT:
+#   - libdeflate/
 URL:            https://www.advancemame.it/
 %global forgeurl https://github.com/amadvance/advancecomp
 Source:         %{forgeurl}/archive/v%{version}/advancecomp-%{version}.tar.gz

From 0b1d468e63c58152cee5de7938179a256b948936 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 11 Dec 2024 14:05:55 -0500
Subject: [PATCH 21/28] Add a SourceLicense field

---
 advancecomp.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/advancecomp.spec b/advancecomp.spec
index a037ca2..3c193c4 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -25,6 +25,7 @@ License:        GPL-3.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
 #   - zopfli/
 # MIT:
 #   - libdeflate/
+SourceLicense:  %{license} AND Apache-2.0 AND MIT
 URL:            https://www.advancemame.it/
 %global forgeurl https://github.com/amadvance/advancecomp
 Source:         %{forgeurl}/archive/v%{version}/advancecomp-%{version}.tar.gz

From f12f185d6d99c45aa96c4873e28b7f371e998869 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 10:39:37 +0000
Subject: [PATCH 22/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From 6d02d1e9e5f613c4798a855757baa1849ab9b44f Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 24 Apr 2025 07:57:12 -0400
Subject: [PATCH 23/28] Update .rpmlintrc file for a new rpmlint verison

---
 advancecomp.rpmlintrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/advancecomp.rpmlintrc b/advancecomp.rpmlintrc
index 483f617..e6d1b0b 100644
--- a/advancecomp.rpmlintrc
+++ b/advancecomp.rpmlintrc
@@ -4,3 +4,5 @@ addFilter(r" unversioned-explicit-provides bundled\(7zip\)")
 addFilter(r" spelling-error \('[Rr]ecompression',")
 addFilter(r" spelling-error \('([pm]ng|gz)',")
 addFilter(r" spelling-error \('adv(zip|[pm]ng|def)',")
+# Intentional, with a justifying spec-file comment
+addFilter(r" no-%install-section")

From c9ae8fd33cfb1cb4eb01d6ad2853dde60a7c8f1d Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 13 Jun 2025 06:18:39 -0400
Subject: [PATCH 24/28] Use the VCS tag

---
 advancecomp.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/advancecomp.spec b/advancecomp.spec
index 3c193c4..c407f26 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -27,8 +27,8 @@ License:        GPL-3.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
 #   - libdeflate/
 SourceLicense:  %{license} AND Apache-2.0 AND MIT
 URL:            https://www.advancemame.it/
-%global forgeurl https://github.com/amadvance/advancecomp
-Source:         %{forgeurl}/archive/v%{version}/advancecomp-%{version}.tar.gz
+VCS:            https://github.com/amadvance/advancecomp
+Source:         %{vcs}/archive/v%{version}/advancecomp-%{version}.tar.gz
 
 BuildRequires:  autoconf
 BuildRequires:  automake

From 6d838becc0ebd031bc26de1cbe79dca3d9178d6c Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 13 Jun 2025 06:36:08 -0400
Subject: [PATCH 25/28] Revert "Use the VCS tag"; tag contents did not follow
 convention

This reverts commit c9ae8fd33cfb1cb4eb01d6ad2853dde60a7c8f1d.
---
 advancecomp.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/advancecomp.spec b/advancecomp.spec
index c407f26..3c193c4 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -27,8 +27,8 @@ License:        GPL-3.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
 #   - libdeflate/
 SourceLicense:  %{license} AND Apache-2.0 AND MIT
 URL:            https://www.advancemame.it/
-VCS:            https://github.com/amadvance/advancecomp
-Source:         %{vcs}/archive/v%{version}/advancecomp-%{version}.tar.gz
+%global forgeurl https://github.com/amadvance/advancecomp
+Source:         %{forgeurl}/archive/v%{version}/advancecomp-%{version}.tar.gz
 
 BuildRequires:  autoconf
 BuildRequires:  automake

From 52005ff32026b6717e2c596a384ed96ab18f913f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 16:47:43 +0000
Subject: [PATCH 26/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 999f9deb8e761bb2b77c76c66d7d17df28da9885 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 7 Jan 2026 16:35:44 +0000
Subject: [PATCH 27/28] Update the .rpmlintrc file

[skip changelog]
---
 advancecomp.rpmlintrc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/advancecomp.rpmlintrc b/advancecomp.rpmlintrc
index e6d1b0b..4e393f3 100644
--- a/advancecomp.rpmlintrc
+++ b/advancecomp.rpmlintrc
@@ -1,8 +1,6 @@
-# Spec file comment shows that exact version is unknown
-addFilter(r" unversioned-explicit-provides bundled\(7zip\)")
 # Not real spelling errors
 addFilter(r" spelling-error \('[Rr]ecompression',")
 addFilter(r" spelling-error \('([pm]ng|gz)',")
 addFilter(r" spelling-error \('adv(zip|[pm]ng|def)',")
 # Intentional, with a justifying spec-file comment
-addFilter(r" no-%install-section")
+addFilter(r" no-%check-section")

From 5066c0040bd172fa978e9efd6107b37668c49f5e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 03:29:01 +0000
Subject: [PATCH 28/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild