From baaae169adbeabe8acf010c1dd1db1db49b56c4a Mon Sep 17 00:00:00 2001
From: wangkerong <wangkerong@h-partners.com>
Date: Fri, 18 Nov 2022 02:09:39 +0000
Subject: [PATCH] rebase 2203-LTS-Next from master

---
 cdrkit-1.1.11-sw.patch | 32 +++++++++++++++++++++++++++++
 cdrkit.spec            | 46 ++++++++++++++++++++++++++++--------------
 2 files changed, 63 insertions(+), 15 deletions(-)
 create mode 100755 cdrkit-1.1.11-sw.patch

diff --git a/cdrkit-1.1.11-sw.patch b/cdrkit-1.1.11-sw.patch
new file mode 100755
index 0000000..37f46c0
--- /dev/null
+++ b/cdrkit-1.1.11-sw.patch
@@ -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
+ 
diff --git a/cdrkit.spec b/cdrkit.spec
index 0709abb..045a3a5 100644
--- a/cdrkit.spec
+++ b/cdrkit.spec
@@ -1,13 +1,14 @@
 Name:              cdrkit
 Version:           1.1.11
-Release:           46
+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
@@ -30,6 +31,9 @@ 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 
@@ -47,6 +51,7 @@ Summary:           genisoimage packages for cdrkit
 Requires:          libusal = %{version}-%{release}
 Requires(preun):   %{_sbindir}/alternatives coreutils
 Requires(post):    %{_sbindir}/alternatives coreutils
+Obsoletes:	   cdrkit-help < %{version}-%{release}
 
 %description    -n genisoimage
 Genisoimage packages for cdrkit
@@ -63,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
@@ -76,8 +82,6 @@ Obsoletes:         libusal-devel
 %description       devel
 Header files for cdrkit.
 
-%package_help
-
 %prep
 %autosetup -n %{name}-%{version} -p1
 
@@ -176,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)
@@ -187,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)
@@ -201,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)
@@ -210,14 +227,13 @@ 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
+* 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