From 93f35b31735e4362bcf2129cf03f6d1a6eeaaa8b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 9 Nov 2023 10:46:52 -0500 Subject: [PATCH 01/15] 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 Date: Fri, 19 Jan 2024 12:18:11 +0000 Subject: [PATCH 02/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 97cb7201ea2fb805e1706864b8a66a93ce032f31 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:43:47 +0000 Subject: [PATCH 03/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b849bab27f3a01b9e435e96a58835863b29ae492 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 5 Mar 2024 08:55:52 -0500 Subject: [PATCH 04/15] 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 Date: Wed, 17 Jul 2024 16:39:52 +0000 Subject: [PATCH 05/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 014ec9f6e9b09ea75be27c2b6197a7404843fa0d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 31 Oct 2024 14:10:42 -0400 Subject: [PATCH 06/15] 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" Date: Wed, 11 Dec 2024 14:03:31 -0500 Subject: [PATCH 07/15] 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" Date: Wed, 11 Dec 2024 14:05:55 -0500 Subject: [PATCH 08/15] 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 Date: Thu, 16 Jan 2025 10:39:37 +0000 Subject: [PATCH 09/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6d02d1e9e5f613c4798a855757baa1849ab9b44f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 24 Apr 2025 07:57:12 -0400 Subject: [PATCH 10/15] 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" Date: Fri, 13 Jun 2025 06:18:39 -0400 Subject: [PATCH 11/15] 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" Date: Fri, 13 Jun 2025 06:36:08 -0400 Subject: [PATCH 12/15] 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 Date: Wed, 23 Jul 2025 16:47:43 +0000 Subject: [PATCH 13/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 999f9deb8e761bb2b77c76c66d7d17df28da9885 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 7 Jan 2026 16:35:44 +0000 Subject: [PATCH 14/15] 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 Date: Fri, 16 Jan 2026 03:29:01 +0000 Subject: [PATCH 15/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild