From ed89bfca20c3f1c9afc46db308b055f2746c6d78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:27:28 +0000 Subject: [PATCH 1/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index 25ec451..32ed03b 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 32%{?dist} +Release: 33%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility License: GPLv2+ @@ -45,6 +45,9 @@ autoreconf -fiv %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.0.10-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 3.0.10-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f088ab6f842870c79b0264c5fdf9f34cd1a2002c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 02:54:31 +0200 Subject: [PATCH 2/8] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- shntool.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/shntool.spec b/shntool.spec index 32ed03b..cf6a100 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,9 +1,10 @@ Name: shntool Version: 3.0.10 -Release: 33%{?dist} +Release: 34%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://etree.org/shnutils/shntool Source0: http://etree.org/shnutils/shntool/dist/src/%{name}-%{version}.tar.gz # Patches are from Debian @@ -45,6 +46,9 @@ autoreconf -fiv %changelog +* Fri Jul 26 2024 Miroslav Suchý - 3.0.10-34 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 3.0.10-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 52714566ae615befe043ffce477f2d1a2133346f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:36:09 +0000 Subject: [PATCH 3/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index cf6a100..5428568 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 34%{?dist} +Release: 35%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -46,6 +46,9 @@ autoreconf -fiv %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.0.10-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 3.0.10-34 - convert license to SPDX From a6c69cc164f9f88bfb07dc3c30f4a83dbffc0f82 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Wed, 22 Jan 2025 20:14:11 -0500 Subject: [PATCH 4/8] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 111 +++++++++++++++++++++++++++++++++++++++++++++++++ shntool.spec | 114 +-------------------------------------------------- 2 files changed, 113 insertions(+), 112 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..8df8f65 --- /dev/null +++ b/changelog @@ -0,0 +1,111 @@ +* Sun Jan 19 2025 Fedora Release Engineering - 3.0.10-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 26 2024 Miroslav Suchý - 3.0.10-34 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 3.0.10-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 3.0.10-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 3.0.10-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 3.0.10-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 3.0.10-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 3.0.10-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Oct 08 2021 Felix Kaechele - 3.0.10-27 +- add patch to support newer wavepack header versions (rhbz#1940701) + +* Fri Jul 23 2021 Fedora Release Engineering - 3.0.10-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 3.0.10-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.0.10-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu May 07 2020 Felix Kaechele - 3.0.10-23 +- Fix for rhbz#1833083 (shntool: cannot split 24-bit flac files) + +* Thu Jan 30 2020 Fedora Release Engineering - 3.0.10-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 3.0.10-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 3.0.10-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 20 2018 Felix Kaechele - 3.0.10-19 +- Add gcc BuildRequires + +* Sat Jul 14 2018 Fedora Release Engineering - 3.0.10-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Apr 17 2018 Leigh Scott - 3.0.10-17 +- Fix splitting large files at high bitrate +- Clean spec file + +* Fri Feb 09 2018 Fedora Release Engineering - 3.0.10-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 3.0.10-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 3.0.10-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 3.0.10-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 3.0.10-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 3.0.10-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 3.0.10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 3.0.10-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Sep 01 2013 Felix Kaechele - 3.0.10-8 +- run autoreconf during setup for aarch64 support + +* Sun Aug 04 2013 Fedora Release Engineering - 3.0.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 3.0.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 3.0.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 3.0.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 3.0.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Jul 26 2009 Fedora Release Engineering - 3.0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Apr 09 2009 Felix Kaechele - 3.0.10-1 +- 3.0.10 + +* Sun Mar 29 2009 Felix Kaechele - 3.0.9-1 +- 3.0.9 + +* Tue Mar 03 2009 Felix Kaechele - 3.0.8-1 +- initial build diff --git a/shntool.spec b/shntool.spec index 5428568..ce2d3eb 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 35%{?dist} +Release: %autorelease Summary: A multi-purpose WAVE data processing and reporting utility # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -46,114 +46,4 @@ autoreconf -fiv %changelog -* Sun Jan 19 2025 Fedora Release Engineering - 3.0.10-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 3.0.10-34 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 3.0.10-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 3.0.10-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 3.0.10-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 3.0.10-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 3.0.10-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 3.0.10-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Oct 08 2021 Felix Kaechele - 3.0.10-27 -- add patch to support newer wavepack header versions (rhbz#1940701) - -* Fri Jul 23 2021 Fedora Release Engineering - 3.0.10-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 3.0.10-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 3.0.10-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu May 07 2020 Felix Kaechele - 3.0.10-23 -- Fix for rhbz#1833083 (shntool: cannot split 24-bit flac files) - -* Thu Jan 30 2020 Fedora Release Engineering - 3.0.10-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 3.0.10-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 3.0.10-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 20 2018 Felix Kaechele - 3.0.10-19 -- Add gcc BuildRequires - -* Sat Jul 14 2018 Fedora Release Engineering - 3.0.10-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Apr 17 2018 Leigh Scott - 3.0.10-17 -- Fix splitting large files at high bitrate -- Clean spec file - -* Fri Feb 09 2018 Fedora Release Engineering - 3.0.10-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 3.0.10-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 3.0.10-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 3.0.10-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 3.0.10-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 3.0.10-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 3.0.10-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 3.0.10-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Sep 01 2013 Felix Kaechele - 3.0.10-8 -- run autoreconf during setup for aarch64 support - -* Sun Aug 04 2013 Fedora Release Engineering - 3.0.10-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 3.0.10-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering - 3.0.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 3.0.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Feb 09 2011 Fedora Release Engineering - 3.0.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Jul 26 2009 Fedora Release Engineering - 3.0.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Apr 09 2009 Felix Kaechele - 3.0.10-1 -- 3.0.10 - -* Sun Mar 29 2009 Felix Kaechele - 3.0.9-1 -- 3.0.9 - -* Tue Mar 03 2009 Felix Kaechele - 3.0.8-1 -- initial build +%autochangelog From fc11294121641cb267b7505c696ed617b402f95c Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Wed, 22 Jan 2025 21:20:28 -0500 Subject: [PATCH 5/8] fix gcc 15 build errors - also update upstream URLs Signed-off-by: Felix Kaechele --- gcc-15-fixes.patch | 90 ++++++++++++++++++++++++++++++++++++++++++++++ shntool.spec | 8 +++-- 2 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 gcc-15-fixes.patch diff --git a/gcc-15-fixes.patch b/gcc-15-fixes.patch new file mode 100644 index 0000000..06d190b --- /dev/null +++ b/gcc-15-fixes.patch @@ -0,0 +1,90 @@ +From 9b27cda17e20a733549763579b0734932ab68280 Mon Sep 17 00:00:00 2001 +From: Felix Kaechele +Date: Wed, 22 Jan 2025 20:53:32 -0500 +Subject: [PATCH] gcc 15 fixes + +Signed-off-by: Felix Kaechele +--- + include/format.h | 2 +- + include/mode.h | 2 +- + include/module-types.h | 5 ++--- + src/core_mode.c | 10 ++-------- + 4 files changed, 6 insertions(+), 13 deletions(-) + +diff --git a/include/format.h b/include/format.h +index 567993e805ba..ab293f8ae91d 100644 +--- a/include/format.h ++++ b/include/format.h +@@ -35,7 +35,7 @@ void tagcpy(unsigned char *,unsigned char *); + int tagcmp(unsigned char *,unsigned char *); + + /* function to check if a file name is about to be clobbered, and if so, asks whether this is OK */ +-int clobber_check(char *); ++bool clobber_check(char *); + + /* find an output format module with the given name */ + format_module *find_format(char *); +diff --git a/include/mode.h b/include/mode.h +index a9c8cd003d04..fc13d4f16940 100644 +--- a/include/mode.h ++++ b/include/mode.h +@@ -78,7 +78,7 @@ void create_output_filename(char *,char *,char *); + FILE *open_output_stream(char *,proc_info *); + + /* function to determine if two filenames point to the same file */ +-int files_are_identical(char *,char *); ++bool files_are_identical(char *,char *); + + /* function to remove a file if it exists */ + void remove_file(char *); +diff --git a/include/module-types.h b/include/module-types.h +index c49c6613bde2..2cabf64d3598 100644 +--- a/include/module-types.h ++++ b/include/module-types.h +@@ -23,6 +23,8 @@ + #ifndef __MODULE_TYPES_H__ + #define __MODULE_TYPES_H__ + ++#include ++ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +@@ -44,9 +46,6 @@ + #define PATHSEPCHAR '/' + #endif + +-/* boolean type */ +-typedef int bool; +- + /* wtypes */ + typedef unsigned long wlong; + typedef unsigned short wshort; +diff --git a/src/core_mode.c b/src/core_mode.c +index 4585b8376668..3e0a60c92050 100644 +--- a/src/core_mode.c ++++ b/src/core_mode.c +@@ -564,18 +564,12 @@ static int compare_ascii(const wave_info **w1,const wave_info **w2) + + static void ascii_sort_files(wave_info **filenames, int numfiles) + { +- int (*cmpfunc) (); +- +- cmpfunc = compare_ascii; +- qsort(filenames,numfiles,sizeof(wave_info *),cmpfunc); ++ qsort(filenames,numfiles,sizeof(wave_info *),(int (*)(const void*, const void*))compare_ascii); + } + + static void version_sort_files(wave_info **filenames,int numfiles) + { +- int (*cmpfunc) (); +- +- cmpfunc = compare_version; +- qsort(filenames,numfiles,sizeof(wave_info *),cmpfunc); ++ qsort(filenames,numfiles,sizeof(wave_info *),(int (*)(const void*, const void*))compare_version); + } + + /* public functions */ +-- +2.48.1 + diff --git a/shntool.spec b/shntool.spec index ce2d3eb..083c96e 100644 --- a/shntool.spec +++ b/shntool.spec @@ -5,8 +5,9 @@ Summary: A multi-purpose WAVE data processing and reporting utility # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later -URL: http://etree.org/shnutils/shntool -Source0: http://etree.org/shnutils/shntool/dist/src/%{name}-%{version}.tar.gz +URL: http://shnutils.freeshell.org/shntool/ +Source0: http://shnutils.freeshell.org/shntool/dist/src/%{name}-%{version}.tar.gz + # Patches are from Debian # https://sources.debian.org/patches/shntool/3.0.10-1/ Patch0: large-size.patch @@ -14,8 +15,9 @@ Patch1: large-times.patch Patch2: no-cdquality-check.patch Patch3: https://github.com/max619/shntool/commit/cfd06e4edecdca2013e0fe04db135fd110a68203.patch Patch4: 0001-fix-valid-wavepack-header-versions.patch +Patch5: gcc-15-fixes.patch -BuildRequires: make +BuildRequires: make BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc From 37dd055148561c4b3edbfe1335363d3b4944e8eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:14:46 +0000 Subject: [PATCH 6/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 8b57ed0a884d5973e46838f752c9d97732f8ceb9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 17:59:42 +0000 Subject: [PATCH 7/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 7f7c945d2b3cbec0442dcae5d2fdbf2f58899355 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 06:29:50 +0000 Subject: [PATCH 8/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild