audiofile.spec

@@ -3,18 +3,16 @@
 Summary: Library for accessing various audio file formats
 Name: audiofile
 Version: 0.3.6
-Release: 34%{?dist}
+Release: 22%{?dist}
 Epoch: 1
 # library is LGPL / the two programs GPL / see README
-License: LGPL-2.1-or-later and GPL-2.0-or-later
+License: LGPLv2+ and GPLv2+
 Source: http://audiofile.68k.org/%{name}-%{version}.tar.gz
 URL: http://audiofile.68k.org/
 BuildRequires:  gcc-c++
 BuildRequires: libtool
 BuildRequires: alsa-lib-devel
 BuildRequires: flac-devel
-BuildRequires: make
-BuildRequires: chrpath
 # optional for rebuilding manual pages from .txt
 #BuildRequires: asciidoc
 
@@ -29,7 +27,6 @@ Patch5: audiofile-0.3.6-pull44.patch
 Patch6: 822b732fd31ffcb78f6920001e9b1fbd815fa712.patch
 Patch7: 941774c8c0e79007196d7f1e7afdc97689f869b3.patch
 Patch8: fde6d79fb8363c4a329a184ef0b107156602b225.patch
-Patch9: integer-overflow.patch
 
 %description
 The Audio File library is an implementation of the Audio File Library
@@ -59,11 +56,10 @@ other resources you can use to develop Audio File applications.
 %patch6 -p1 -b .CVE-2018-17095
 %patch7 -p1 -b .CVE-2018-13440
 %patch8 -p1 -b .CVE-2018-13440
-%patch9 -p1 -b .integer-overflow
 
 
 %build
-%configure --disable-rpath
+%configure
 %make_build
 
 %install
@@ -72,13 +68,11 @@ other resources you can use to develop Audio File applications.
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/sfconvert
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/sfinfo
 
-#%check
-#%if %{make_check}
-#make check
-#%endif
+%check
+%if %{make_check}
+make check
+%endif
 
 
 %ldconfig_scriptlets
@@ -100,42 +94,6 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/sfinfo
 %{_mandir}/man3/*
 
 %changelog
-* Thu Mar 02 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:0.3.6-34
-- migrated to SPDX license
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.6-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Sep 13 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 1:0.3.6-32
-- Rebuilt for flac 1.4.0
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.6-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.6-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.6-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu May 27 2021 Gwyn Ciesla <gwync@protonmail.com> - 1:0.3.6-28
-- Disable RPATH.
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.6-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jan 04 2021 Timm Bäder <tbaeder@redhat.com> - 1:0.3.6-26
-- Fix a integer overflow warning with gcc and error with clang
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.6-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.6-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.6-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.6-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

integer-overflow.patch

@@ -1,12 +0,0 @@
-diff -ruN audiofile-0.3.6.orig/test/Sign.cpp audiofile-0.3.6/test/Sign.cpp
---- audiofile-0.3.6.orig/test/Sign.cpp	2021-01-04 12:50:58.563336280 +0100
-+++ audiofile-0.3.6/test/Sign.cpp	2021-01-04 13:00:55.536214264 +0100
-@@ -157,7 +157,7 @@
- 	AFframecount framesRead = afReadFrames(file, AF_DEFAULT_TRACK, readData, frameCount);
- 	ASSERT_EQ(framesRead, frameCount);
- 	afCloseFile(file);
--	const uint32_t expectedData[] = { 0, -kMinInt32, kMaxUInt32 };
-+	const uint32_t expectedData[] = { 0, static_cast<uint32_t>(-kMinInt32), kMaxUInt32 };
- 	for (int i=0; i<frameCount; i++)
- 		EXPECT_EQ(readData[i], expectedData[i]);
- }