!47 [sync] PR-45: delete autosetup macro in changelog

From: @openeuler-sync-bot Reviewed-by: @t_feng Signed-off-by: @t_feng
delete autosetup macro in changelog
2024-01-04 08:26:55 +00:00 · 2024-01-04 14:54:14 +08:00 · 2024-01-02 06:54:19 +00:00 · 2023-12-30 22:16:30 +08:00 · 2022-11-23 06:42:02 +00:00 · 2022-11-23 13:59:30 +08:00
4 changed files with 108 additions and 18 deletions
--- a/cdrkit-1.1.11-gcc10.patch
+++ b/cdrkit-1.1.11-gcc10.patch
@ -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 */
--- a/cdrkit-1.1.11-sw.patch
+++ 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
+ 
--- a/cdrkit.spec
+++ b/cdrkit.spec
@ -1,13 +1,14 @@
 Name:              cdrkit
 Version:           1.1.11
-Release:           43
+Release:           51
 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} wodim = %{version}-%{release}
+Obsoletes:         dirsplit < %{version}-%{release} wodim < %{version}-%{release}
+Obsoletes:	   cdrkit-help < %{version}-%{release}

 Patch1:            cdrkit-1.1.8-werror.patch
 Patch2:            cdrkit-1.1.9-efi-boot.patch
@ -29,12 +30,16 @@ 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
+Requires:          libusal = %{version}-%{release} 
 Requires(preun):   %{_sbindir}/alternatives coreutils
 Requires(post):    %{_sbindir}/alternatives coreutils

@ -46,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
@ -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,13 +227,36 @@ 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
+* Thu Jan 4 2024 zhangpan<zhangpan103@h-partners.com> - 1.1.11-51
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- delete autosetup macro in changelog
+
+* Mon Oct 30 2023 yueyuankun<yueyuankun@kylinos.cn> - 1.1.11-50
+- Type:update
+- ID:NA
+- SUG:NA
+- DESC:delete Requires git
+
+* Wed Nov 23 2022 wangkerong<wangkerong@h-partners.com> - 1.1.11-49
+- fix spell error
+
+* 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
--- a/cdrkit.yaml
+++ b/cdrkit.yaml
@ -0,0 +1,4 @@
+version_control: github
+src_repo: Distrotech/cdrkit
+tag_prefix: ^release_
+seperator: .
Author	SHA1	Message	Date
openeuler-ci-bot	7fb0431fd8	!47 [sync] PR-45: delete autosetup macro in changelog From: @openeuler-sync-bot Reviewed-by: @t_feng Signed-off-by: @t_feng	2024-01-04 08:26:55 +00:00
zhangpan	482516987b	delete autosetup macro in changelog (cherry picked from commit 859252aaf844b3294de3a942998e4dcab01ba65c)	2024-01-04 14:54:14 +08:00
openeuler-ci-bot	d95a4a762b	!38 [sync] PR-36: 移除安装依赖git From: @openeuler-sync-bot Reviewed-by: @yanan-rock Signed-off-by: @yanan-rock	2024-01-02 06:54:19 +00:00
yueyuankun	6f7b1bdd10	移除git安装依赖git (cherry picked from commit 4d7508cc799fb3962cd52484f1d8b7306b28dc19)	2023-12-30 22:16:30 +08:00
openeuler-ci-bot	473efec2d8	!32 [sync] PR-30: 【轻量级 PR】：fix spell error From: @openeuler-sync-bot Reviewed-by: @t_feng Signed-off-by: @t_feng	2022-11-23 06:42:02 +00:00
kerongw	e18385f109	fix spell error Signed-off-by: kerongw <wangkerong@h-partners.com> (cherry picked from commit 00a390ccdf4d9a68b53b0c967eedc3e62cd75259)	2022-11-23 13:59:30 +08:00
openeuler-ci-bot	c202a4f2b3	!29 rebase 2003-LTS-SP3 from master From: @kerongw Reviewed-by: @t_feng Signed-off-by: @t_feng	2022-11-18 03:17:40 +00:00
wangkerong	b1fb16e5ff	rebase 2003-LTS-SP3 from master	2022-11-18 02:25:30 +00:00
openeuler-ci-bot	44a7b6e197	!18 [sync] PR-17: 【轻量级 PR】：fix-empty-link From: @openeuler-sync-bot Reviewed-by: @t_feng Signed-off-by: @t_feng	2022-11-17 03:02:16 +00:00
kerongw	6e22ed1d61	fix-empty-link Signed-off-by: kerongw <wangkerong@h-partners.com> (cherry picked from commit b5dc0b8cc7cddff9e9a26258838a3c3a586910e2)	2022-11-15 09:33:46 +08:00