From c5a8ce8facbef89dc53d4d7cfa78457df651e8fa Mon Sep 17 00:00:00 2001 From: jiangfangjie 00559066 Date: Tue, 7 Mar 2023 10:26:00 +0800 Subject: [PATCH 1/3] remove rpath Signed-off-by: jiangfangjie 00559066 --- swtpm.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/swtpm.spec b/swtpm.spec index 1758173..ec84691 100644 --- a/swtpm.spec +++ b/swtpm.spec @@ -8,7 +8,7 @@ Summary: TPM Emulator Name: swtpm Version: 0.8.0 -Release: 1 +Release: 2 License: BSD Url: https://github.com/stefanberger/swtpm Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -37,6 +37,7 @@ BuildRequires: selinux-policy-devel BuildRequires: gcc BuildRequires: libseccomp-devel BuildRequires: tpm2-tools +BuildRequires: chrpath Requires: %{name}-libs = %{version}-%{release} Requires: libtpms >= 0.6.0 @@ -94,12 +95,18 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.{a,la,so} rm -f $RPM_BUILD_ROOT%{_mandir}/man8/swtpm-create-tpmca.8* rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/swtpm-create-tpmca +chrpath -d %{buildroot}/%{_bindir}/swtpm +mkdir -p %{buildroot}/etc/ld.so.conf.d +echo "%{_libdir}/%{name}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf + %post for pp in /usr/share/selinux/packages/swtpm.pp \ /usr/share/selinux/packages/swtpm_svirt.pp; do %selinux_modules_install -s %{selinuxtype} ${pp} done +/sbin/ldconfig + %postun if [ $1 -eq 0 ]; then for p in swtpm swtpm_svirt; do @@ -113,6 +120,8 @@ fi %ldconfig_post libs %ldconfig_postun libs +/sbin/ldconfig + %files %license LICENSE %doc README @@ -120,6 +129,7 @@ fi %{_mandir}/man8/swtpm.8* %{_datadir}/selinux/packages/swtpm.pp %{_datadir}/selinux/packages/swtpm_svirt.pp +%config(noreplace) /etc/ld.so.conf.d/* %files libs %license LICENSE @@ -162,6 +172,9 @@ fi %attr( 750, tss, root) %{_localstatedir}/lib/swtpm-localca %changelog +* Thu Mar 7 2023 jiangfangjie - 0.8.0-2 +- Rmove rpath + * Fri Feb 03 2023 yezengruan - 0.8.0-1 - update to version 0.8.0 -- Gitee From a656c808c1ea20f34bb5c48d14a8f34578f29f6d Mon Sep 17 00:00:00 2001 From: JackJF Date: Tue, 7 Mar 2023 02:48:03 +0000 Subject: [PATCH 2/3] update swtpm.spec. Signed-off-by: JackJF --- swtpm.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/swtpm.spec b/swtpm.spec index ec84691..603c39f 100644 --- a/swtpm.spec +++ b/swtpm.spec @@ -172,8 +172,8 @@ fi %attr( 750, tss, root) %{_localstatedir}/lib/swtpm-localca %changelog -* Thu Mar 7 2023 jiangfangjie - 0.8.0-2 -- Rmove rpath +* Thu Mar 07 2023 jiangfangjie - 0.8.0-2 +- Remove rpath * Fri Feb 03 2023 yezengruan - 0.8.0-1 - update to version 0.8.0 -- Gitee From c0201ff44c5644215b5aaf6d930d5389c927557d Mon Sep 17 00:00:00 2001 From: JackJF Date: Tue, 7 Mar 2023 05:29:00 +0000 Subject: [PATCH 3/3] update swtpm.spec. Signed-off-by: JackJF --- swtpm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swtpm.spec b/swtpm.spec index 603c39f..a7622e8 100644 --- a/swtpm.spec +++ b/swtpm.spec @@ -172,7 +172,7 @@ fi %attr( 750, tss, root) %{_localstatedir}/lib/swtpm-localca %changelog -* Thu Mar 07 2023 jiangfangjie - 0.8.0-2 +* Tue Mar 07 2023 jiangfangjie - 0.8.0-2 - Remove rpath * Fri Feb 03 2023 yezengruan - 0.8.0-1 -- Gitee