packages/cdrkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase 2003-LTS-SP3 from master

Browse Source
This commit is contained in:
wangkerong 2022-11-18 02:25:30 +00:00
parent 44a7b6e197
commit b1fb16e5ff
4 changed files with 92 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,13 @@
reference:src.fedoraproject.org/rpms/cdrkit/blob/rawhide/f/cdrkit-1.1.11-gcc10.patch
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 */

32
cdrkit-1.1.11-sw.patch Executable file
View File

@ -0,0 +1,32 @@
diff -Naur cdrkit-1.1.11.org/include/btorder.h cdrkit-1.1.11.sw/include/btorder.h
--- cdrkit-1.1.11.org/include/btorder.h 2022-02-28 02:48:17.340000000 +0000
+++ cdrkit-1.1.11.sw/include/btorder.h 2022-02-28 02:52:34.310000000 +0000
@@ -112,6 +112,7 @@
# if defined(__i386__) || defined(__i386) || defined(i386) || \
defined(__alpha__) || defined(__alpha) || defined(alpha) || \
+ defined(__sw_64__) || defined(__sw_64) || defined(sw_64) || \
defined(__arm__) || defined(__arm) || defined(arm)
# define _BIT_FIELDS_LTOH
# endif
diff -Naur cdrkit-1.1.11.org/libusal/scsi-vms.c cdrkit-1.1.11.sw/libusal/scsi-vms.c
--- cdrkit-1.1.11.org/libusal/scsi-vms.c 2022-02-28 02:48:17.310000000 +0000
+++ cdrkit-1.1.11.sw/libusal/scsi-vms.c 2022-02-28 02:54:34.040000000 +0000
@@ -117,7 +117,7 @@
Uint SCSI$L_RES_6; /* Reserved */
};
-#ifdef __ALPHA
+#if defined __ALPHA || defined __SW_64
#pragma member_alignment save
#pragma nomember_alignment
#endif
@@ -129,7 +129,7 @@
Uchar SCSI$B_IOSB_STS; /* SCSI device status */
};
-#ifdef __ALPHA
+#if defined __ALPHA || defined __SW_64
#pragma member_alignment restore
#endif

63
cdrkit.spec
View File

@ -1,13 +1,14 @@
Name: cdrkit
Version: 1.1.11
Release: 44
Release: 48
Summary: A collection of CD/DVD utilities
License: GPLv2
URL: http://cdrkit.org/
Source0: http://cdrkit.org/releases/cdrkit-%{version}.tar.gz
Provides: dirsplit wodim
Obsoletes: dirsplit wodim
Provides: dirsplit = %{version}-%{release} wodima = %{version}-%{release}
Obsoletes: dirsplit < %{version}-%{release} wodima < %{version}-%{release}
Obsoletes: cdrkit-help < %{version}-%{release}
Patch1: cdrkit-1.1.8-werror.patch
Patch2: cdrkit-1.1.9-efi-boot.patch
@ -29,9 +30,13 @@ 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: cdrkit-1.1.11-gcc10.patch
%ifarch sw_64
Patch24: cdrkit-1.1.11-sw.patch
%endif
BuildRequires: gcc cmake libcap-devel zlib-devel perl-interpreter
BuildRequires: perl-generators file-devel bzip2-devel git
BuildRequires: perl-generators file-devel bzip2-devel
Requires: perl-interpreter >= 4:5.8.1 genisoimage = %{version}-%{release}
Requires: libusal = %{version}-%{release} git
@ -45,7 +50,8 @@ A collection of CD/DVD utilities
Summary: genisoimage packages for cdrkit
Requires: libusal = %{version}-%{release}
Requires(preun): %{_sbindir}/alternatives coreutils
Requires(post): %{_sbindir}/alternatives coreutils %{name}-help
Requires(post): %{_sbindir}/alternatives coreutils
Obsoletes: cdrkit-help < %{version}-%{release}
%description -n genisoimage
Genisoimage packages for cdrkit
@ -62,6 +68,7 @@ BuildRequires: cdparanoia-devel
Requires: libusal = %{version}-%{release} vorbis-tools cdparanoia
Requires(preun): %{_sbindir}/alternatives coreutils
Requires(post): %{_sbindir}/alternatives coreutils
Obsoletes: cdrkit-help < %{version}-%{release}
%description -n icedax
Icedax for cdrkit
@ -75,10 +82,8 @@ Obsoletes: libusal-devel
%description devel
Header files for cdrkit.
%package_help
%prep
%autosetup -n %{name}-%{version} -p1 -S git
%autosetup -n %{name}-%{version} -p1
%build
mkdir build
@ -175,9 +180,13 @@ fi
%{_bindir}/readom
%{_bindir}/dirsplit
%exclude %{_bindir}/cdda2mp3
%ghost %{_bindir}/cdrecord
%ghost %{_bindir}/dvdrecord
%{_mandir}/man1/devdump.*
%{_mandir}/man1/wodim.*
%{_mandir}/man1/netscsid.*
%{_mandir}/man1/readom.*
%{_mandir}/man1/dirsplit.*
%files -n genisoimage
%defattr(-,root,root)
@ -186,9 +195,16 @@ fi
%{_bindir}/readmult
%{_bindir}/pitchplay
%{_bindir}/genisoimage
%ghost %{_bindir}/mkisofs
%ghost %{_bindir}/mkhybrid
%{_mandir}/man5/genisoimagerc.*
%{_mandir}/man1/genisoimage.*
%{_mandir}/man1/isodebug.*
%{_mandir}/man1/isodump.*
%{_mandir}/man1/isoinfo.*
%{_mandir}/man1/isovfy.*
%{_mandir}/man1/pitchplay.*
%{_mandir}/man1/readmult.*
%files -n libusal
%defattr(-,root,root)
@ -200,8 +216,10 @@ fi
%license COPYING
%{_bindir}/icedax
%{_bindir}/cdda2ogg
%ghost %{_bindir}/cdda2wav
%{_mandir}/man1/icedax.*
%{_mandir}/man1/cdda2ogg.*
%{_mandir}/man1/list_audio_tracks.*
%files devel
%defattr(-,root,root)
@ -209,16 +227,21 @@ fi
%{_libdir}/*.so
%{_includedir}/usal
%files help
%defattr(-,root,root)
%doc doc/READMEs doc/wodim
%doc Changelog FAQ FORK START doc/icedax
%doc doc/genisoimage doc/plattforms/README.linux
%{_mandir}/*
%changelog
* Tue Nov 01 2022 wangkerong <wangkerong@h-partners.com> - 1.1.11-44
- fix-empty-link
* Wed Nov 16 2022 wangkerong<wangkerong@h-partners.com> - 1.1.11-48
- fix empty link
* Thu Nov 3 2022 wuzx<wuzx1226@qq.com> - 1.1.11-47
- add sw64 patch
* Tue Oct 25 2022 wangkerong <wangkerong@h-partners.com> - 1.1.11-46
- rebuild for next release
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 1.1.11-45
- DESC: delete -S git from %autosetup, and delete BuildRequires git
* Fri Jul 30 2021 liuyumeng <liuyumeng5@huawei.com> - 1.1.11-44
- fix build fail on gcc-10
* Fri Sep 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.1.11-43
- Package init

4
cdrkit.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: Distrotech/cdrkit
tag_prefix: ^release_
seperator: .