From 841a558d6a8aa83d2a092c753cbc6b1ea8021a3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 16:40:38 +0000 Subject: [PATCH 01/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index 7d638a0..56cfcac 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility Group: Applications/Multimedia @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From c13d90d8ea44a3bfe78743c6a1dc3ada1cbeb7f0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:37:20 +0100 Subject: [PATCH 02/29] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- shntool.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index 56cfcac..6b251b4 100644 --- a/shntool.spec +++ b/shntool.spec @@ -7,7 +7,6 @@ Group: Applications/Multimedia License: GPLv2+ URL: http://etree.org/shnutils/shntool Source0: http://etree.org/shnutils/shntool/dist/src/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf automake From dd5bfaf69cc66d926d6330c8b07a0f84dc8c5f0a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:49:49 +0100 Subject: [PATCH 03/29] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- shntool.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/shntool.spec b/shntool.spec index 6b251b4..2892fac 100644 --- a/shntool.spec +++ b/shntool.spec @@ -30,9 +30,6 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) From 9c2e242d3e69212a6b2ae5a34cbfea341ed6f578 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 17 Apr 2018 17:26:54 +0100 Subject: [PATCH 04/29] Fix splitting large files at high bitrate --- large-size.patch | 29 ++++++++++++++++++++++++ large-times.patch | 49 ++++++++++++++++++++++++++++++++++++++++ no-cdquality-check.patch | 21 +++++++++++++++++ shntool.spec | 32 +++++++++++++++----------- 4 files changed, 118 insertions(+), 13 deletions(-) create mode 100644 large-size.patch create mode 100644 large-times.patch create mode 100644 no-cdquality-check.patch diff --git a/large-size.patch b/large-size.patch new file mode 100644 index 0000000..be1e354 --- /dev/null +++ b/large-size.patch @@ -0,0 +1,29 @@ +Last-Update: 2014-11-15 +Forwarded: yes +From: Adam Sampson +Bug-Debian: http://bugs.debian.org/684600 +Description: fix large files processing. + +--- a/src/core_fileio.c ++++ b/src/core_fileio.c +@@ -109,12 +109,18 @@ + + buf[4] = 0; + + if (be_val) +- *be_val = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]; ++ *be_val = (((unsigned long)buf[0]) << 24) ++ | (((unsigned long)buf[1]) << 16) ++ | (((unsigned long)buf[2]) << 8) ++ | ((unsigned long)buf[3]); + + if (le_val) +- *le_val = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; ++ *le_val = (((unsigned long)buf[3]) << 24) ++ | (((unsigned long)buf[2]) << 16) ++ | (((unsigned long)buf[1]) << 8) ++ | ((unsigned long)buf[0]); + + if (tag_val) + tagcpy(tag_val,buf); + diff --git a/large-times.patch b/large-times.patch new file mode 100644 index 0000000..5b51770 --- /dev/null +++ b/large-times.patch @@ -0,0 +1,49 @@ +Last-Update: 2014-11-15 +Forwarded: yes +From: Adam Sampson +Bug-Debian: http://bugs.debian.org/684600 +Description: fix large files processing. + +--- a/src/core_mode.c ++++ b/src/core_mode.c +@@ -309,10 +309,10 @@ + + if (sec >= 60) + st_error("invalid value for seconds: [%d]",sec); + +- bytes = (wlong)(min * info->rate * 60) + +- (wlong)(sec * info->rate); ++ bytes = (((wlong)min) * info->rate * 60) + ++ (((wlong)sec) * info->rate); + + return bytes; + } + +@@ -357,11 +357,11 @@ + + if (frames >= 75) + st_error("invalid value for frames: [%d]",frames); + +- bytes = (wlong)(min * CD_RATE * 60) + +- (wlong)(sec * CD_RATE) + +- (wlong)(frames * CD_BLOCK_SIZE); ++ bytes = (((wlong)min) * CD_RATE * 60) + ++ (((wlong)sec) * CD_RATE) + ++ (((wlong)frames) * CD_BLOCK_SIZE); + + return bytes; + } + +@@ -402,10 +402,10 @@ + st_error("invalid value for seconds: [%d]",sec); + + nearest_byte = (int)((((double)ms * (double)info->rate) / 1000.0) + 0.5); + +- bytes = (wlong)(min * info->rate * 60) + +- (wlong)(sec * info->rate); ++ bytes = (((wlong)min) * info->rate * 60) + ++ (((wlong)sec) * info->rate); + + if (PROB_NOT_CD(info)) { + bytes += nearest_byte; + } diff --git a/no-cdquality-check.patch b/no-cdquality-check.patch new file mode 100644 index 0000000..4ca3717 --- /dev/null +++ b/no-cdquality-check.patch @@ -0,0 +1,21 @@ +Last-Update: 2014-11-15 +Forwarded: yes +Author: Dmitry Smirnov +Bug-Debian: http://bugs.debian.org/769585 +Description: disable CD-quality check, needed to process 24bit 96kHz files. + +--- a/src/core_mode.c ++++ b/src/core_mode.c +@@ -344,10 +344,10 @@ + + *colon = 0; + *dot = 0; + +- if (PROB_NOT_CD(info)) +- st_error("m:ss.ff format can only be used with CD-quality files"); ++// if (PROB_NOT_CD(info)) ++// st_error("m:ss.ff format can only be used with CD-quality files"); + + min = atoi((const char *)buf); + sec = atoi((const char *)(colon+1)); + frames = atoi((const char *)(dot+1)); diff --git a/shntool.spec b/shntool.spec index 2892fac..b279cff 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,14 +1,20 @@ Name: shntool Version: 3.0.10 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility Group: Applications/Multimedia License: GPLv2+ URL: http://etree.org/shnutils/shntool Source0: http://etree.org/shnutils/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 +Patch1: large-times.patch +Patch2: no-cdquality-check.patch -BuildRequires: autoconf automake +BuildRequires: autoconf +BuildRequires: automake %description A multi-purpose WAVE data processing and reporting utility. File @@ -17,29 +23,29 @@ WAVE data, compressed or not - provided there exists a format module to handle that particular file type. %prep -%setup -q -autoreconf -f -i +%autosetup -p1 +autoreconf -fiv %build %configure -make %{?_smp_mflags} - +%make_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - - +%make_install %files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS ChangeLog NEWS README %doc doc/* +%license COPYING %{_bindir}/shn* -%{_mandir}/man1/%{name}.1.gz +%{_mandir}/man1/%{name}.1.* %changelog +* 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 From 2b102e2eb8e45640df06728201f410a4e55574d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 06:05:15 +0000 Subject: [PATCH 05/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index b279cff..62b8f13 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility Group: Applications/Multimedia @@ -42,6 +42,9 @@ autoreconf -fiv %changelog +* 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 From 73e8b1de93dd95dd9cb893266f005e2aacd5ad78 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Fri, 20 Jul 2018 21:47:37 +0200 Subject: [PATCH 06/29] Add gcc BuildRequires --- shntool.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index 62b8f13..faa1502 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility Group: Applications/Multimedia @@ -15,6 +15,7 @@ Patch2: no-cdquality-check.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: gcc %description A multi-purpose WAVE data processing and reporting utility. File @@ -42,6 +43,9 @@ autoreconf -fiv %changelog +* 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 From 5c9fb7f45e8db7ed9fddbe98afbc0cb23f5832b5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:25 +0100 Subject: [PATCH 07/29] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- shntool.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index faa1502..8c368f1 100644 --- a/shntool.spec +++ b/shntool.spec @@ -3,7 +3,6 @@ Version: 3.0.10 Release: 19%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility -Group: Applications/Multimedia License: GPLv2+ URL: http://etree.org/shnutils/shntool Source0: http://etree.org/shnutils/shntool/dist/src/%{name}-%{version}.tar.gz From d35557d732a74ef42550431da683513bba6be5f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 15:21:21 +0000 Subject: [PATCH 08/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index 8c368f1..63f6fb5 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 19%{?dist} +Release: 20%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility License: GPLv2+ @@ -42,6 +42,9 @@ autoreconf -fiv %changelog +* 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 From a0f140f31d212b7f7dce8efa339370e006e31081 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 23:14:57 +0000 Subject: [PATCH 09/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index 63f6fb5..afd53d9 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 20%{?dist} +Release: 21%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility License: GPLv2+ @@ -42,6 +42,9 @@ autoreconf -fiv %changelog +* 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 From 867491c7b9c9bcc4246f4b97905158c243dbe532 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:23:51 +0000 Subject: [PATCH 10/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index afd53d9..ee55388 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 21%{?dist} +Release: 22%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility License: GPLv2+ @@ -42,6 +42,9 @@ autoreconf -fiv %changelog +* 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 From 4ea7b564954bb206a42b04f7cb747f7c3ff2fb6b Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Thu, 7 May 2020 15:21:14 -0400 Subject: [PATCH 11/29] Fix for rhbz#1833083 (shntool: cannot split 24-bit flac files) Signed-off-by: Felix Kaechele --- ...6e4edecdca2013e0fe04db135fd110a68203.patch | 47 +++++++++++++++++++ shntool.spec | 6 ++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 cfd06e4edecdca2013e0fe04db135fd110a68203.patch diff --git a/cfd06e4edecdca2013e0fe04db135fd110a68203.patch b/cfd06e4edecdca2013e0fe04db135fd110a68203.patch new file mode 100644 index 0000000..ffd82f5 --- /dev/null +++ b/cfd06e4edecdca2013e0fe04db135fd110a68203.patch @@ -0,0 +1,47 @@ +From cfd06e4edecdca2013e0fe04db135fd110a68203 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=91=D0=B0=D0=B3?= + =?UTF-8?q?=D1=80=D1=8F=D0=BD=D1=86=D0=B5=D0=B2?= +Date: Mon, 11 Nov 2019 00:53:06 +0300 +Subject: [PATCH] Added WAVE_FORMAT_EXTENSIBLE with value 0xfffe and supressed + error on wav header parsing with that format + +--- + include/wave.h | 1 + + src/core_wave.c | 5 ++++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/include/wave.h b/include/wave.h +index 01aa3fe..039ca19 100644 +--- a/include/wave.h ++++ b/include/wave.h +@@ -59,6 +59,7 @@ + #define WAVE_FORMAT_MPEGLAYER3 (0x0055) + #define WAVE_FORMAT_G726_ADPCM (0x0064) + #define WAVE_FORMAT_G722_ADPCM (0x0065) ++#define WAVE_FORMAT_EXTENSIBLE (0xfffe) + + #define CD_BLOCK_SIZE (2352) + #define CD_BLOCKS_PER_SEC (75) +diff --git a/src/core_wave.c b/src/core_wave.c +index 47c36c9..7bea4d1 100644 +--- a/src/core_wave.c ++++ b/src/core_wave.c +@@ -167,6 +167,7 @@ bool verify_wav_header_internal(wave_info *info,bool verbose) + } + + switch (info->wave_format) { ++ case WAVE_FORMAT_EXTENSIBLE: + case WAVE_FORMAT_PCM: + break; + default: +@@ -511,7 +512,9 @@ char *format_to_str(wshort format) + case WAVE_FORMAT_G726_ADPCM: + return "G.726 ADPCM"; + case WAVE_FORMAT_G722_ADPCM: +- return "G.722 ADPCM"; ++ return "G.722 ADPCM"; ++ case WAVE_FORMAT_EXTENSIBLE: ++ return "WAVE Extensible format"; + } + return "Unknown"; + } diff --git a/shntool.spec b/shntool.spec index ee55388..b3aeebd 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 22%{?dist} +Release: 23%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility License: GPLv2+ @@ -11,6 +11,7 @@ Source0: http://etree.org/shnutils/shntool/dist/src/%{name}-%{version}.ta Patch0: large-size.patch Patch1: large-times.patch Patch2: no-cdquality-check.patch +Patch3: https://github.com/max619/shntool/commit/cfd06e4edecdca2013e0fe04db135fd110a68203.patch BuildRequires: autoconf BuildRequires: automake @@ -42,6 +43,9 @@ autoreconf -fiv %changelog +* 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 From 4537fea5c0750f00ad8bb4926a26c4dcd95be32c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:40:39 +0000 Subject: [PATCH 12/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index b3aeebd..5ed94c1 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 23%{?dist} +Release: 24%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility License: GPLv2+ @@ -43,6 +43,9 @@ autoreconf -fiv %changelog +* 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) From 5e3eafb2618f80db95eb6fd1b6d7d844b0b3e3ca Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:27:38 +0000 Subject: [PATCH 13/29] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- shntool.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/shntool.spec b/shntool.spec index 5ed94c1..a06e0e6 100644 --- a/shntool.spec +++ b/shntool.spec @@ -13,6 +13,7 @@ Patch1: large-times.patch Patch2: no-cdquality-check.patch Patch3: https://github.com/max619/shntool/commit/cfd06e4edecdca2013e0fe04db135fd110a68203.patch +BuildRequires: make BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc From d3dc2e34c6ddc6d2ef01dc4679b19f8365a38bb8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:20:27 +0000 Subject: [PATCH 14/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index a06e0e6..b01f7f6 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 24%{?dist} +Release: 25%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility License: GPLv2+ @@ -44,6 +44,9 @@ autoreconf -fiv %changelog +* 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 From ee1bb8c2feae17673b8685fb5518b7847b6cf45d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:30:39 +0000 Subject: [PATCH 15/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index b01f7f6..9552d5a 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 25%{?dist} +Release: 26%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility License: GPLv2+ @@ -44,6 +44,9 @@ autoreconf -fiv %changelog +* 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 From 90cf5153a3ca199bcb5d7d1ccf9fa8f801f91e52 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Thu, 7 Oct 2021 22:46:28 -0400 Subject: [PATCH 16/29] add patch to support newer wavepack header versions (rhbz#1940701) Signed-off-by: Felix Kaechele --- 0001-fix-valid-wavepack-header-versions.patch | 28 +++++++++++++++++++ shntool.spec | 6 +++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0001-fix-valid-wavepack-header-versions.patch diff --git a/0001-fix-valid-wavepack-header-versions.patch b/0001-fix-valid-wavepack-header-versions.patch new file mode 100644 index 0000000..ebbfac0 --- /dev/null +++ b/0001-fix-valid-wavepack-header-versions.patch @@ -0,0 +1,28 @@ +From bb245a645b69602582e14bccda0158209b38c74b Mon Sep 17 00:00:00 2001 +From: Felix Kaechele +Date: Thu, 7 Oct 2021 22:42:57 -0400 +Subject: [PATCH] fix valid wavepack header versions + +https://bugzilla.redhat.com/show_bug.cgi?id=1940701 + +Signed-off-by: Felix Kaechele +--- + src/format_wv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/format_wv.c b/src/format_wv.c +index 3222bc8..288fee3 100644 +--- a/src/format_wv.c ++++ b/src/format_wv.c +@@ -251,7 +251,7 @@ static bool is_our_file(char *filename) + + little_endian_to_native(wph4,WavpackHeader4Format); + +- if (tagcmp((unsigned char *)wph4->ckID,(unsigned char *)WAVPACK_MAGIC) || wph4->version < 4 || wph4->version > 0x40f) { ++ if (tagcmp((unsigned char *)wph4->ckID,(unsigned char *)WAVPACK_MAGIC) || wph4->version < 4 || wph4->version > 0x410) { + return FALSE; + } + +-- +2.33.0 + diff --git a/shntool.spec b/shntool.spec index 9552d5a..7968a2f 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 26%{?dist} +Release: 27%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility License: GPLv2+ @@ -12,6 +12,7 @@ Patch0: large-size.patch 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 BuildRequires: make BuildRequires: autoconf @@ -44,6 +45,9 @@ autoreconf -fiv %changelog +* 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 From f9fe1d6585c3342f0683d7bfde97a2dfe0dd46ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 00:49:57 +0000 Subject: [PATCH 17/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index 7968a2f..66c7b19 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 27%{?dist} +Release: 28%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility License: GPLv2+ @@ -45,6 +45,9 @@ autoreconf -fiv %changelog +* 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) From ce1f68515cef1acc8bd5eeb233107adcf0db9241 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:32:19 +0000 Subject: [PATCH 18/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index 66c7b19..2202e24 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 28%{?dist} +Release: 29%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility License: GPLv2+ @@ -45,6 +45,9 @@ autoreconf -fiv %changelog +* 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 From 136e42e187fbc4c5f887bab924b8837d512de1a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:10:52 +0000 Subject: [PATCH 19/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index 2202e24..727264d 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 29%{?dist} +Release: 30%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility License: GPLv2+ @@ -45,6 +45,9 @@ autoreconf -fiv %changelog +* 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 From 0a956e7fcc9f4d0c14b2e839eda188552fa08212 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:35:27 +0000 Subject: [PATCH 20/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index 727264d..2937658 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 30%{?dist} +Release: 31%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility License: GPLv2+ @@ -45,6 +45,9 @@ autoreconf -fiv %changelog +* 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 From cf55460da2c291dcd5be385282ef3ebb5f757c95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:57:34 +0000 Subject: [PATCH 21/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- shntool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shntool.spec b/shntool.spec index 2937658..25ec451 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,6 +1,6 @@ Name: shntool Version: 3.0.10 -Release: 31%{?dist} +Release: 32%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility License: GPLv2+ @@ -45,6 +45,9 @@ autoreconf -fiv %changelog +* 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 From ed89bfca20c3f1c9afc46db308b055f2746c6d78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:27:28 +0000 Subject: [PATCH 22/29] 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 23/29] 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 24/29] 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 25/29] 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 26/29] 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 27/29] 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 28/29] 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 29/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild