diff --git a/.cdrkit.metadata b/.cdrkit.metadata index ea6fa92..c99ac70 100644 --- a/.cdrkit.metadata +++ b/.cdrkit.metadata @@ -1 +1 @@ -3f7ddc06db0272942e1a4cd98c3c96462df77387 SOURCES/cdrkit-1.1.11.tar.gz +3f7ddc06db0272942e1a4cd98c3c96462df77387 SOURCES/cdrkit-1.1.11.tar.gz diff --git a/SOURCES/cdrkit-1.1.11-gcc10.patch b/SOURCES/cdrkit-1.1.11-gcc10.patch new file mode 100644 index 0000000..99f0c10 --- /dev/null +++ b/SOURCES/cdrkit-1.1.11-gcc10.patch @@ -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 */ diff --git a/SPECS/cdrkit.spec b/SPECS/cdrkit.spec index f1942cb..8980c53 100644 --- a/SPECS/cdrkit.spec +++ b/SPECS/cdrkit.spec @@ -1,11 +1,10 @@ -Summary: A collection of CD/DVD utilities -Name: cdrkit +Name: cdrkit Version: 1.1.11 -Release: 39%{?dist} +Release: 48%{?dist} +Summary: A collection of CD/DVD utilities License: GPLv2 -Group: Applications/System -URL: http://cdrkit.org/ -Source: http://cdrkit.org/releases/cdrkit-%{version}.tar.gz +URL: http://cdrkit.org/ +Source: http://cdrkit.org/releases/cdrkit-%{version}.tar.gz Patch1: cdrkit-1.1.8-werror.patch Patch2: cdrkit-1.1.9-efi-boot.patch @@ -27,9 +26,8 @@ Patch19: cdrkit-1.1.11-ppc64le_elfheader.patch Patch20: cdrkit-1.1.11-werror_gcc5.patch Patch21: cdrkit-1.1.11-devname.patch Patch22: cdrkit-1.1.11-sysmacros.patch - -Patch23: 0001-fix-file-name-buffer-overflow-in-isoinfo.patch - +Patch23: cdrkit-1.1.11-gcc10.patch +BuildRequires: gcc BuildRequires: cmake libcap-devel zlib-devel perl-interpreter perl-generators file-devel bzip2-devel %description @@ -37,12 +35,7 @@ cdrkit is a collection of CD/DVD utilities. %package -n wodim Summary: A command line CD/DVD recording program -Group: Applications/Archiving -Obsoletes: dvdrecord <= 0:0.1.5 -Provides: dvdrecord = 0:0.1.5.1 -Obsoletes: cdrecord < 9:2.01-12 -Provides: cdrecord = 9:2.01-12 -Requires: libusal = %{version}-%{release} +Requires: libusal%{?_isa} = %{version}-%{release} Requires(preun): %{_sbindir}/alternatives coreutils Requires(post): %{_sbindir}/alternatives coreutils @@ -53,10 +46,7 @@ multi-sessions and provides human-readable error messages. %package -n genisoimage Summary: Creates an image of an ISO9660 file-system -Group: Applications/System -Obsoletes: mkisofs < 9:2.01-12 -Provides: mkisofs = 9:2.01-12 -Requires: libusal = %{version}-%{release} +Requires: libusal%{?_isa} = %{version}-%{release} Requires(preun): %{_sbindir}/alternatives coreutils Requires(post): %{_sbindir}/alternatives coreutils @@ -73,22 +63,18 @@ CD-ROMs. %package -n dirsplit Summary: Utility to split directories -Group: Applications/System Requires: perl-interpreter >= 4:5.8.1 -Requires: genisoimage = %{version}-%{release} +Requires: genisoimage%{?_isa} = %{version}-%{release} %description -n dirsplit This utility is used to split directories into chunks before burning. Chunk size is usually set to fit to a CD/DVD. %package -n icedax -Group: Applications/Multimedia Summary: A utility for sampling/copying .wav files from digital audio CDs -Obsoletes: cdda2wav < 9:2.01-12 -Provides: cdda2wav = 9:2.01-12 -Requires: libusal = %{version}-%{release} -Requires(preun): %{_sbindir}/alternatives chkconfig coreutils -Requires(post): %{_sbindir}/alternatives chkconfig coreutils +Requires: libusal%{?_isa} = %{version}-%{release} +Requires(preun): %{_sbindir}/alternatives coreutils +Requires(post): %{_sbindir}/alternatives coreutils Requires: vorbis-tools Requires: cdparanoia BuildRequires: cdparanoia-devel @@ -102,7 +88,6 @@ rates. Icedax can also be used as a CD player. %package -n libusal Summary: Library to communicate with SCSI devices -Group: Development/Libraries %description -n libusal The libusal package contains C libraries that allows applications @@ -111,8 +96,7 @@ CD-R media. %package -n libusal-devel Summary: Development files for libusal -Group: Development/Libraries -Requires: libusal = %{version}-%{release} +Requires: libusal%{?_isa} = %{version}-%{release} %description -n libusal-devel The libusal-devel package contains C libraries and header files @@ -142,8 +126,7 @@ SCSI devices. %patch20 -p1 -b .werror_gcc5 %patch21 -p1 -b .devname %patch22 -p1 -b .sysmacros - -%patch23 -p1 -b .namesize +%patch23 -p1 -b .gcc10 # we do not want bundled paranoia library rm -rf libparanoia @@ -153,21 +136,18 @@ find doc -type f -print0 | xargs -0 chmod a-x %build -mkdir fedora -cd fedora export CFLAGS="$RPM_OPT_FLAGS -Wno-error=format-security -fno-strict-aliasing" export CXXFLAGS="$CFLAGS" export FFLAGS="$CFLAGS" -%cmake CMAKE_VERBOSE=1 \ + +%cmake \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DBUILD_SHARED_LIBS:BOOL=ON \ -.. + -DBUILD_SHARED_LIBS:BOOL=ON -make VERBOSE=1 %{?_smp_mflags} +%cmake_build %install -cd fedora -make install DESTDIR=$RPM_BUILD_ROOT +%cmake_install perl -pi -e 's#^require v5.8.1;##g' $RPM_BUILD_ROOT%{_bindir}/dirsplit ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkisofs ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkhybrid @@ -175,10 +155,6 @@ ln -s icedax $RPM_BUILD_ROOT%{_bindir}/cdda2wav ln -s wodim $RPM_BUILD_ROOT%{_bindir}/cdrecord ln -s wodim $RPM_BUILD_ROOT%{_bindir}/dvdrecord -#do not include empty fedora/* directories in debuginfo package -cd .. -rm -rf fedora - # missing man page. Do symlink like in debian ln -sf wodim.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/netscsid.1.gz @@ -245,12 +221,11 @@ if [ $1 = 0 ]; then %{_sbindir}/alternatives --remove cdda2wav %{_bindir}/icedax fi -%post -n libusal -p /sbin/ldconfig - -%postun -n libusal -p /sbin/ldconfig +%ldconfig_scriptlets -n libusal %files -n wodim -%doc Changelog COPYING FAQ FORK START +%license COPYING +%doc Changelog FAQ FORK START %doc doc/READMEs doc/wodim %{_bindir}/devdump %{_bindir}/wodim @@ -264,7 +239,8 @@ fi %{_mandir}/man1/readom.* %files -n icedax -%doc doc/icedax COPYING +%license COPYING +%doc doc/icedax %{_bindir}/icedax %ghost %{_bindir}/cdda2wav %{_bindir}/cdda2ogg @@ -273,7 +249,8 @@ fi %{_mandir}/man1/list_audio_tracks.* %files -n genisoimage -%doc doc/genisoimage COPYING +%license COPYING +%doc doc/genisoimage %{_bindir}/genisoimage %ghost %{_bindir}/mkisofs %ghost %{_bindir}/mkhybrid @@ -293,24 +270,56 @@ fi %{_mandir}/man1/readmult.* %files -n dirsplit +%license COPYING %{_bindir}/dirsplit %{_mandir}/man1/dirsplit.* %files -n libusal -%doc doc/plattforms/README.linux Changelog COPYING FAQ FORK START +%license COPYING +%doc doc/plattforms/README.linux Changelog FAQ FORK START %{_libdir}/libusal.so.* %{_libdir}/librols.so.* %files -n libusal-devel -%doc COPYING +%license COPYING %{_libdir}/libusal.so %{_libdir}/librols.so %{_includedir}/usal %changelog -* Thu Aug 02 2018 Jakub Martisko - 1.1.11-39 -- Fix buffer overflow erro in isoinfo caused by long names -- Resolves: 1533004 +* Thu Oct 05 2023 Arkady L. Shane - 1.1.11-48 +- Rebuilt for MSVSphere 9.2 + +* Wed Jul 21 2021 Fedora Release Engineering - 1.1.11-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.1.11-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Aug 01 2020 Fedora Release Engineering - 1.1.11-46 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.1.11-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Feb 24 2020 Than Ngo - 1.1.11-44 +- Fixed FTBFS + +* Tue Jan 28 2020 Fedora Release Engineering - 1.1.11-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 1.1.11-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 1.1.11-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1.1.11-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jul 4 2018 Peter Robinson 1.1.11-39 +- Spec cleanup and modernise, use %%license * Wed Feb 07 2018 Fedora Release Engineering - 1.1.11-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild