From 7fefa963ed0cad77ab61c85076fa694440eefe25b15bf409cf285d5f2503fbde Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Fri, 16 Jul 2021 08:13:53 +0000 Subject: [PATCH] Accepting request 906490 from home:gmbr3:Active - Remove conflicting sysusers.d file OBS-URL: https://build.opensuse.org/request/show/906490 OBS-URL: https://build.opensuse.org/package/show/security/tpm2-0-tss?expand=0&rev=112 --- tpm2-0-tss.changes | 5 +++++ tpm2-0-tss.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tpm2-0-tss.changes b/tpm2-0-tss.changes index 3653dc1..daab9c4 100644 --- a/tpm2-0-tss.changes +++ b/tpm2-0-tss.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 15 15:51:04 UTC 2021 - Callum Farmer + +- Remove conflicting sysusers.d file + ------------------------------------------------------------------- Wed Jul 14 15:11:55 UTC 2021 - Callum Farmer diff --git a/tpm2-0-tss.spec b/tpm2-0-tss.spec index 07cc3c4..937c794 100644 --- a/tpm2-0-tss.spec +++ b/tpm2-0-tss.spec @@ -200,6 +200,8 @@ find %{buildroot} -type f -name "*.la" -delete -print # rename the rules file to have a numbered prefix as all others have, too %define udev_rule_file 90-tpm.rules mv %{buildroot}%{_udevrulesdir}/tpm-udev.rules %{buildroot}%{_udevrulesdir}/%{udev_rule_file} +# Conflicts with system-users +rm %{buildroot}%{_sysusersdir}/tpm2-tss.conf %post %_bindir/udevadm trigger -s tpm -s tpmrm || : @@ -237,7 +239,6 @@ mv %{buildroot}%{_udevrulesdir}/tpm-udev.rules %{buildroot}%{_udevrulesdir}/%{ud %{_mandir}/man5/* %{_mandir}/man7/tss2-* %{_udevrulesdir}/%{udev_rule_file} -%{_sysusersdir}/tpm2-tss.conf %dir /etc/tpm2-tss/ %config /etc/tpm2-tss/fapi-config.json %dir /etc/tpm2-tss/fapi-profiles