From 95dc2f5dd783ff3322ec6e64568a86b3a3a39731 Mon Sep 17 00:00:00 2001 From: zhoupengcheng Date: Wed, 9 Oct 2024 11:22:04 +0800 Subject: [PATCH] Check whether the lcap compilation option needs to be added. (cherry picked from commit 4ca5b511be2f9a08ae96bbf21af9bddc5092c239) --- star.spec | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/star.spec b/star.spec index 72883a0..799d985 100755 --- a/star.spec +++ b/star.spec @@ -8,9 +8,9 @@ Name: star Version: 1.6 -Release: 7 +Release: 9 Summary: An archiver supports ACL -License: CDDL +License: CDDL-1.0 URL: http://freecode.com/projects/%{name} Source: https://fossies.org/linux/misc/%{name}-%{version}.tar.bz2 @@ -55,6 +55,11 @@ for PLAT in %{arm} %{power64} aarch64 loongarch64 %{mips} x86_64 riscv64 sw_64; done %build +LCAP_FLAG="" +if pkg-config --exists 'libcap'; then + LCAP_FLAG="-lcap" +fi + %global make_flags GMAKE_NOWARN=true \\\ RUNPATH= \\\ LDPATH= \\\ @@ -64,7 +69,7 @@ done INS_RBASE=%{buildroot} \\\ INSTALL='sh $(SRCROOT)/conf/install-sh -c -m $(INSMODEINS)' \\\ COPTX="$RPM_OPT_FLAGS -DTRY_EXT2_FS" \\\ - LDOPTX="$RPM_LD_FLAGS" \\\ + LDOPTX="$RPM_LD_FLAGS $LCAP_FLAG" \\\ DEFCCOM=gcc %make_build %make_flags @@ -130,7 +135,13 @@ fi %{_mandir}/man1/rmt.* %changelog -Fri Aug 11 2023 yeqinglong - 1.6-7 +* Wed Oct 9 zhoupengcheng - 1.6-9 +- DESC:Check whether the lcap compilation option needs to be added. + +* Tue Jun 28 2022 Chenyx - 1.6-8 +- License compliance rectification + +* Fri Aug 11 2023 yeqinglong - 1.6-7 - add sw_64 support * Mon Nov 21 2022 huajingyun - 1.6-6