Fixed FTBFS

This commit is contained in:
Than Ngo 2020-02-24 15:14:25 +01:00
parent 38506e225e
commit 28936386b0
2 changed files with 18 additions and 1 deletions

12
cdrkit-1.1.11-gcc10.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up cdrkit-1.1.11/genisoimage/genisoimage.h.me cdrkit-1.1.11/genisoimage/genisoimage.h
--- cdrkit-1.1.11/genisoimage/genisoimage.h.me 2020-02-24 15:10:35.542998992 +0100
+++ cdrkit-1.1.11/genisoimage/genisoimage.h 2020-02-24 15:10:50.011130450 +0100
@@ -377,7 +377,7 @@ extern int use_fileversion;
extern int split_SL_component;
extern int split_SL_field;
extern char *trans_tbl;
-char *outfile;
+extern char *outfile;
#define JMAX 64 /* maximum Joliet file name length (spec) */
#define JLONGMAX 103 /* out of spec Joliet file name length */

View File

@ -1,6 +1,6 @@
Name: cdrkit Name: cdrkit
Version: 1.1.11 Version: 1.1.11
Release: 43%{?dist} Release: 44%{?dist}
Summary: A collection of CD/DVD utilities Summary: A collection of CD/DVD utilities
License: GPLv2 License: GPLv2
URL: http://cdrkit.org/ URL: http://cdrkit.org/
@ -26,6 +26,7 @@ Patch19: cdrkit-1.1.11-ppc64le_elfheader.patch
Patch20: cdrkit-1.1.11-werror_gcc5.patch Patch20: cdrkit-1.1.11-werror_gcc5.patch
Patch21: cdrkit-1.1.11-devname.patch Patch21: cdrkit-1.1.11-devname.patch
Patch22: cdrkit-1.1.11-sysmacros.patch Patch22: cdrkit-1.1.11-sysmacros.patch
Patch23: cdrkit-1.1.11-gcc10.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: cmake libcap-devel zlib-devel perl-interpreter perl-generators file-devel bzip2-devel BuildRequires: cmake libcap-devel zlib-devel perl-interpreter perl-generators file-devel bzip2-devel
@ -125,6 +126,7 @@ SCSI devices.
%patch20 -p1 -b .werror_gcc5 %patch20 -p1 -b .werror_gcc5
%patch21 -p1 -b .devname %patch21 -p1 -b .devname
%patch22 -p1 -b .sysmacros %patch22 -p1 -b .sysmacros
%patch23 -p1 -b .gcc10
# we do not want bundled paranoia library # we do not want bundled paranoia library
rm -rf libparanoia rm -rf libparanoia
@ -292,6 +294,9 @@ fi
%{_includedir}/usal %{_includedir}/usal
%changelog %changelog
* Mon Feb 24 2020 Than Ngo <than@redhat.com> - 1.1.11-44
- Fixed FTBFS
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-43 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild