From 210fab84dc4f0d98f587ca261323a7809568530491552b8642df1ab838baca0a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 31 Dec 2020 09:31:21 +0000 Subject: [PATCH] https://bugzilla.opensuse.org/show_bug.cgi?id=1180474 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/polkit?expand=0&rev=73 --- polkit.changes | 14 -------------- polkit.spec | 15 +++++---------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/polkit.changes b/polkit.changes index f8e42a6..220b41a 100644 --- a/polkit.changes +++ b/polkit.changes @@ -1,17 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 29 08:39:01 UTC 2020 - Matthias Gerstner - -- also set libprivdir during build, otherwhise systemd and D-Bus service files - contain the wrong path and we'll get runtime errors. - -------------------------------------------------------------------- -Mon Dec 28 12:26:34 UTC 2020 - Matthias Gerstner - -- Install private binaries into libexec instead of into lib. For this an - override of the custom libprivdir variable is necessary, because upstream - explicitly moved away from libexecdir via upstram commit - 6fbcc6cd839680fcefd81c4a43676e7c031c9859. - ------------------------------------------------------------------- Fri Oct 23 08:19:06 UTC 2020 - Bjørn Lie diff --git a/polkit.spec b/polkit.spec index 82f18a1..335f54e 100644 --- a/polkit.spec +++ b/polkit.spec @@ -130,15 +130,10 @@ export SUID_LDFLAGS="-z now -pie" --enable-examples \ --enable-libsystemd-login \ %{nil} -%make_build libprivdir=%{_libexecdir}/polkit-1 +%make_build %install -# install explicitly into libexec. upstream has some unflexible logic for -# these executable at the moment, but there is a PR# open to fix this: -# https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/63 -# once this has been resolved upstream and we update to a new release we can -# remove this. -%make_install libprivdir=%{_libexecdir}/polkit-1 +%make_install find %{buildroot} -type f -name "*.la" -delete -print # create $HOME for polkit user install -d %{buildroot}%{_localstatedir}/lib/polkit @@ -203,9 +198,9 @@ exit 0 %{_bindir}/pkcheck %verify(not mode) %attr(4755,root,root) %{_bindir}/pkexec %{_bindir}/pkttyagent -%dir %{_libexecdir}/polkit-1 -%{_libexecdir}/polkit-1/polkitd -%verify(not mode) %attr(4755,root,root) %{_libexecdir}/polkit-1/polkit-agent-helper-1 +%dir %{_prefix}/lib/polkit-1 +%{_prefix}/lib/polkit-1/polkitd +%verify(not mode) %attr(4755,root,root) %{_prefix}/lib/polkit-1/polkit-agent-helper-1 # $HOME for polkit user %dir %{_localstatedir}/lib/polkit %{_unitdir}/polkit.service