Correct License field to account for bundled zopfli

[skip changelog]

.gitignore

@@ -9,4 +9,3 @@ 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

advancecomp.rpmlintrc

@@ -1,6 +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-%check-section")

advancecomp.spec

@@ -1,5 +1,5 @@
 Name:           advancecomp
-Version:        2.6
+Version:        2.5
 Release:        %autorelease
 Summary:        Recompression utilities for .png, .mng, .zip and .gz files
 
@@ -14,21 +14,26 @@ 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.
 #
+# Apache-2.0:
+#   - zopfli/
+#
 # 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
+License:        %{shrink:
+                GPL-3.0-only AND
+                GPL-2.0-or-later AND
+                LGPL-2.1-or-later AND
+                Apache-2.0
+                }
 # 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/
-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
+Source0:        %{forgeurl}/archive/v%{version}/advancecomp-%{version}.tar.gz
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -43,12 +48,14 @@ BuildRequires:  dos2unix
 BuildRequires:  zlib-devel
 
 # Unbundled downstream
-BuildRequires:  pkgconfig(libdeflate) >= 1.19
-BuildRequires:  zopfli-devel
+BuildRequires:  pkgconfig(libdeflate)
 
-# The point of the 2.6 release was to upgrade the bundled libdeflate; enforce
-# this on the unbundled libdeflate.
-Requires:       libdeflate >= 1.19
+# No libzopfli/zopfli-devel in EPEL8
+#
+# 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^20160527git6818a08
 
 # From 7z/README:
 #
@@ -89,7 +96,7 @@ This package contains:
 dos2unix -k doc/*.txt
 
 # Patch out bundled libdeflate
-rm -rv libdeflate
+rm -rvf 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.
@@ -98,21 +105,9 @@ find . -type f -exec gawk \
     '{}' '+' |
   xargs -r -t sed -r -i 's@^([[:blank:]]*#include.*)libdeflate/@\1@'
 
-# Patch out bundled zopfli
-rm -rv zopfli
-sed -r -i \
-    -e '/zopfli[\/_]/d' \
-    -e 's/((\(7z_SOURCES\)|WindowOut\.h).*)[[:blank:]]*\\/\1/' \
-    Makefile.am
-# Fix up #include paths. The find-then-modify pattern keeps us from discarding
-# mtimes on any sources that do not need modification.
-find . -type f -exec gawk \
-    '/^[[:blank:]]*#include.*zopfli/ { print FILENAME; nextfile }' \
-    '{}' '+' |
-  xargs -r -t sed -r -i -e 's@^([[:blank:]]*#include.*)zopfli/@\1@'
 
-
-%conf
+%build
+%set_build_flags
 autoreconf --force --install --verbose
 
 # Link against system libdeflate
@@ -120,13 +115,7 @@ export CFLAGS="$(pkgconf --cflags libdeflate) ${CFLAGS-}"
 export CXXFLAGS="$(pkgconf --cflags libdeflate) ${CXXFLAGS-}"
 export LDFLAGS="$(pkgconf --libs libdeflate) ${LDFLAGS-}"
 
-# Link against system zopfli
-export LDFLAGS="-lzopfli ${LDFLAGS-}"
-
 %configure
-
-
-%build
 %make_build
 
 

changelog

@@ -7,34 +7,9 @@
 - Remove unnecessary BR on tofrodos
 - Properly document bundled 7z code
 
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-16
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
 * Mon Jul 27 2020 Jeff Law <law@redhat.com> - 2.1-15
 - Force C++14 as the code is not ready for C++17
 
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Fri May 10 2019 Than Ngo <than@redhat.com> - 2.1-11
 - Backport for #1708563, CVE-2019-8383 - denial of service in function adv_png_unfilter_8
 

sources

@@ -1 +1 @@
-SHA512 (advancecomp-2.6.tar.gz) = 63cbb0578f96fd3f55ccb49e31bfe945649d36a11558aa482332440943d6d347f161de797b8d4469562b1d551b274c22fe08818179926d56aa4746581d3926dd
+SHA512 (advancecomp-2.5.tar.gz) = c508526415dc002dad442e3f55202494ab2c49ecac3f5ea6e1a3fe27d224dd9a1a33dace02f59c18123d3f4bc74e3f03556b1cff6541cb88dcaaa32ac35c0043