From 89d067305c31d30af4993604a075261e21720885c3ba2d888fe04e152db65fa4 Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Tue, 3 Jul 2018 10:46:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/security/tpm2.0-abrmd?expand=0&rev=23 --- tpm2.0-abrmd.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tpm2.0-abrmd.spec b/tpm2.0-abrmd.spec index c46561f..8d155ee 100644 --- a/tpm2.0-abrmd.spec +++ b/tpm2.0-abrmd.spec @@ -36,6 +36,10 @@ BuildRequires: pkgconfig(tss2-sys) Requires(pre): pwdutils BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: fix_dlopen.patch +# the auto activation is not whitelisted for <= SLE12-SP3 +%if 0%{?sle_version} > 120300 || 0%{?is_opensuse} +%define install_dbus_files 1 +%endif %description The tpm2.0-abrmd package provides the TPM2 Access Broker & Resource Manager. @@ -83,6 +87,10 @@ ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rctpm2-abrmd # don't install the systemd preset, our presets are handled by # systemd-presets-* packages rm %{buildroot}/usr/lib*/systemd/system-preset/tpm2-abrmd.preset +%if ! 0%{?install_dbus_files} +rm %{_sysconfdir}/dbus-1/system.d/tpm2-abrmd.conf +rm %{_datadir}/dbus-1/system-services/com.intel.tss2.Tabrmd.service +%endif %pre %service_add_pre tpm2-abrmd.service @@ -104,7 +112,7 @@ rm %{buildroot}/usr/lib*/systemd/system-preset/tpm2-abrmd.preset %{_sbindir}/tpm2-abrmd %{_sbindir}/rctpm2-abrmd %{_unitdir}/tpm2-abrmd.service -%if 0%{?sle_version} > 120200 || 0%{?is_opensuse} +%if 0%{?install_dbus_files} # the auto activation is not whitelisted for <= SLE12-SP3 %config %{_sysconfdir}/dbus-1/system.d/tpm2-abrmd.conf %{_datadir}/dbus-1/system-services/com.intel.tss2.Tabrmd.service