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
This commit is contained in:
Matthias Gerstner 2021-07-16 08:13:53 +00:00 committed by Git OBS Bridge
parent bcdc60d0a7
commit 7fefa963ed
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jul 15 15:51:04 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
- Remove conflicting sysusers.d file
-------------------------------------------------------------------
Wed Jul 14 15:11:55 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>

View File

@ -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