2 changed files with 6 additions and 46 deletions
--- a/0100-star-uos-add-sw64-support.patch
+++ b/0100-star-uos-add-sw64-support.patch
@ -1,12 +0,0 @@
-diff -Naur a/RULES/MKLINKS b/RULES/MKLINKS
--- a/RULES/MKLINKS	2018-11-15 07:19:51.000000000 +0800
-+++ b/RULES/MKLINKS	2024-12-12 15:55:05.771844486 +0800
-@@ -464,6 +464,8 @@
- $symlink	bepc-haiku-cc.rul	x86_64-haiku-cc.rul
- $symlink	bepc-haiku-gcc.rul	x86_64-haiku-gcc.rul
- $symlink	alpha-openvms-cc.rul	alphaserver_ds20_500_mhz-openvms-cc.rul
-+$symlink        x86_64-linux-cc.rul       sw_64-linux-cc.rul
-+$symlink        x86_64-linux-gcc.rul      sw_64-linux-gcc.rul
- $symlink	rs6000-aix-cc.rul	rs6000-aix-cc32.rul
- $symlink	rs6000-aix-cc.rul	rs6000-aix-cc64.rul
- $symlink	rs6000-aix-gcc.rul	rs6000-aix-gcc32.rul
--- a/star.spec
+++ b/star.spec
@ -8,9 +8,9 @@

 Name: star
 Version: 1.6
-Release: 10
+Release: 5
 Summary: An archiver supports ACL
-License: CDDL-1.0
+License: CDDL
 URL:     http://freecode.com/projects/%{name}
 Source:  https://fossies.org/linux/misc/%{name}-%{version}.tar.bz2

@ -19,7 +19,6 @@ Patch1:  star-1.5.2-bufferoverflow.patch
 Patch2:  star-1.6-manpagereferences.patch
 Patch3:  star-1.5.2-use-ssh-by-default.patch
 Patch4:  bugfix-star-rmt-add-authority.patch
-Patch5:  0100-star-uos-add-sw64-support.patch

 BuildRequires: libattr-devel libacl-devel libtool libselinux-devel e2fsprogs-devel 
 Provides: scpio = %{version}-%{release} spax = %{version}-%{release} rmt = %{version}-%{release}
@ -48,23 +47,14 @@ star_recode()

 star_recode AN-1.5 AN-1.5.2 star/star.4

-for PLAT in %{arm} %{power64} aarch64 %{mips} x86_64 loongarch64 riscv64; do
-    %if "%toolchain" == "clang"
-	for AFILE in clang; do
-    %else 
+for PLAT in %{arm} %{power64} aarch64 %{mips} x86_64 riscv64; do
    for AFILE in gcc cc; do
-    %endif
            [ ! -e RULES/${PLAT}-linux-${AFILE}.rul ] \
            && ln -s i586-linux-${AFILE}.rul RULES/${PLAT}-linux-${AFILE}.rul
    done
 done

 %build
-LCAP_FLAG=""
-if pkg-config --exists 'libcap'; then
-    LCAP_FLAG="-lcap"
-fi
-
 %global make_flags GMAKE_NOWARN=true                                    \\\
    RUNPATH=                                                            \\\
    LDPATH=                                                             \\\
@ -74,8 +64,8 @@ fi
    INS_RBASE=%{buildroot}                                              \\\
    INSTALL='sh $(SRCROOT)/conf/install-sh -c -m $(INSMODEINS)'         \\\
    COPTX="$RPM_OPT_FLAGS -DTRY_EXT2_FS"                                \\\
-    LDOPTX="$RPM_LD_FLAGS  $LCAP_FLAG"                                  \\\
-    DEFCCOM=%{__cc}
+    LDOPTX="$RPM_LD_FLAGS"                                              \\\
+    DEFCCOM=gcc

 %make_build %make_flags

@ -140,24 +130,6 @@ fi
 %{_mandir}/man1/rmt.*

 %changelog
-* Mon Mar 03 2025 zhangshaoning <zhangshaoning@uniontech.com> - 1.6-10
- Add sw_64 support
-
-* Wed Oct 9 zhoupengcheng <zhoupengcheng11@huawei.com> - 1.6-9
- DESC:Check whether the lcap compilation option needs to be added.
-
-* Thu Feb 22 2024 luofeng <luofeng13@huawei.com> - 1.6-8
- Type:enhencement
- CVE:NA
- SUG:NA
- DESC:support clang build
-
-* Mon Nov 21 2022 huajingyun <huajingyun@loongson.cn> - 1.6-7
- Adapt loongarch for fixing build error
-
-* Tue Jun 28 2022 Chenyx <chenyixiong3@huawei.com> - 1.6-6
- License compliance rectification
-
 * Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 1.6-5
 - DESC: delete -Sgit from %autosetup, and delete BuildRequires git