From 9dda6bd9babe74c0a679d1cff1e9888996767980e8d31d3f76c3348915ba9bef Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 7 Sep 2020 06:47:24 +0000 Subject: [PATCH] Accepting request 828932 from home:dimstar:Factory - Use %{_tmpfilesdir} instead of wrong %{_libexecdir}/tmpfiles.d that just coincidentally happened to match (boo#1174075). OBS-URL: https://build.opensuse.org/request/show/828932 OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=126 --- systemtap.changes | 6 ++++++ systemtap.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/systemtap.changes b/systemtap.changes index 8210168..cd55bff 100644 --- a/systemtap.changes +++ b/systemtap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 24 12:13:19 UTC 2020 - Dominique Leuenberger + +- Use %{_tmpfilesdir} instead of wrong %{_libexecdir}/tmpfiles.d + that just coincidentally happened to match (boo#1174075). + ------------------------------------------------------------------- Thu Feb 6 02:02:58 UTC 2020 - Tony Jones diff --git a/systemtap.spec b/systemtap.spec index d772dc9..9107e2c 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -123,14 +123,14 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/systemtap mkdir -p %{buildroot}%{_localstatedir}/log touch %{buildroot}%{_localstatedir}/log/stap-server.log # config file for stap-server (/var/run now on tmpfs) -mkdir -p %{buildroot}%{_libexecdir}/tmpfiles.d -install -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/tmpfiles.d +mkdir -p %{buildroot}%{_tmpfilesdir} +install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir} %find_lang systemtap %post server # Create tmpfiles -%tmpfiles_create %{_libexecdir}/tmpfiles.d/stap-server.conf +%tmpfiles_create %{_tmpfilesdir}/stap-server.conf %files %defattr(-,root,root) @@ -164,8 +164,8 @@ install -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/tmpfiles.d %files server %defattr(-,root,root) -%dir %{_libexecdir}/tmpfiles.d -%{_libexecdir}/tmpfiles.d/stap-server.conf +%dir %{_tmpfilesdir} +%{_tmpfilesdir}/stap-server.conf %{_bindir}/stap-server %{_libexecdir}/%{name}/stap-gen-cert %{_libexecdir}/%{name}/stap-serverd