Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fde-tools for openSUSE:Factory checked in at 2024-06-11 18:27:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fde-tools (Old) and /work/SRC/openSUSE:Factory/.fde-tools.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fde-tools" Tue Jun 11 18:27:06 2024 rev:23 rq:1179922 version:0.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/fde-tools/fde-tools.changes 2024-05-31 22:15:33.613274346 +0200 +++ /work/SRC/openSUSE:Factory/.fde-tools.new.19518/fde-tools.changes 2024-06-11 18:27:14.156363717 +0200 @@ -1,0 +2,6 @@ +Fri Jun 7 07:52:30 UTC 2024 - Gary Ching-Pang Lin <[email protected]> + +- Update fde-tools-bsc1220160-conditional-requires.patch to + check fde-tpm-helper in %post and %posttrans + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fde-tools-bsc1220160-conditional-requires.patch ++++++ --- /var/tmp/diff_new_pack.zjuxMk/_old 2024-06-11 18:27:15.100398168 +0200 +++ /var/tmp/diff_new_pack.zjuxMk/_new 2024-06-11 18:27:15.104398314 +0200 @@ -1,7 +1,7 @@ -From 7f5a36bb82728a6cce66b15e6bb656ce05cf5978 Mon Sep 17 00:00:00 2001 +From 5f5dc57da2ee1abc3bf63e5389294d97a6027ae8 Mon Sep 17 00:00:00 2001 From: Gary Lin <[email protected]> Date: Tue, 5 Mar 2024 14:51:57 +0800 -Subject: [PATCH] macros.fde-tpm-helper: conditionally requires the helper +Subject: [PATCH 1/2] macros.fde-tpm-helper: conditionally requires the helper fde-tpm-helper is only used when fde-tools is installed. Update the rpm macro to make fde-tpm-helper an conditional "Requires". @@ -24,4 +24,54 @@ -- 2.35.3 + +From 222c145943cde082959de52f5a76dbdf0f254c92 Mon Sep 17 00:00:00 2001 +From: Gary Lin <[email protected]> +Date: Fri, 7 Jun 2024 10:58:45 +0800 +Subject: [PATCH 2/2] macros.fde-tpm-helper: check if fde-tpm-helper exists + +Those rpm macros are only valid for the system with fde-tpm-helper so +those commands should be skipped if fde-tpm-helper is not there. + +Signed-off-by: Gary Lin <[email protected]> +--- + rpm-build/macros.fde-tpm-helper | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/rpm-build/macros.fde-tpm-helper b/rpm-build/macros.fde-tpm-helper +index 3c89e2b..4ce09e9 100644 +--- a/rpm-build/macros.fde-tpm-helper ++++ b/rpm-build/macros.fde-tpm-helper +@@ -1,16 +1,20 @@ + %fde_tpm_update_requires Requires(posttrans): (fde-tpm-helper if fde-tools) + + %fde_tpm_update_post() \ +-mkdir -p %{_rundir}/fde-tpm-helper/ \ +-touch %{_rundir}/fde-tpm-helper/update \ +-for bl in %{?*}; do \ +- echo ${bl} >> %{_rundir}/fde-tpm-helper/update \ +-done \ ++if test -x %{_libexecdir}/fde/fde-tpm-helper; then \ ++ mkdir -p %{_rundir}/fde-tpm-helper/ \ ++ touch %{_rundir}/fde-tpm-helper/update \ ++ for bl in %{?*}; do \ ++ echo ${bl} >> %{_rundir}/fde-tpm-helper/update \ ++ done \ ++fi \ + %nil + + %fde_tpm_update_posttrans() \ +-if test -f %{_rundir}/fde-tpm-helper/update; then \ +- %{_libexecdir}/fde/fde-tpm-helper "`cat %{_rundir}/fde-tpm-helper/update | uniq`" || : \ +- rm -f %{_rundir}/fde-tpm-helper/update \ ++if test -x %{_libexecdir}/fde/fde-tpm-helper; then \ ++ if test -f %{_rundir}/fde-tpm-helper/update; then \ ++ %{_libexecdir}/fde/fde-tpm-helper "`cat %{_rundir}/fde-tpm-helper/update | uniq`" || : \ ++ rm -f %{_rundir}/fde-tpm-helper/update \ ++ fi \ + fi \ + %nil +-- +2.35.3 +
