Dominique Leuenberger 2020-12-31 09:31:21 +00:00 committed by Git OBS Bridge
parent 6d10544d71
commit 210fab84dc
2 changed files with 5 additions and 24 deletions

View File

@ -1,17 +1,3 @@
-------------------------------------------------------------------
Tue Dec 29 08:39:01 UTC 2020 - Matthias Gerstner <matthias.gerstner@suse.com>
- 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 <matthias.gerstner@suse.com>
- 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 <bjorn.lie@gmail.com> Fri Oct 23 08:19:06 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -130,15 +130,10 @@ export SUID_LDFLAGS="-z now -pie"
--enable-examples \ --enable-examples \
--enable-libsystemd-login \ --enable-libsystemd-login \
%{nil} %{nil}
%make_build libprivdir=%{_libexecdir}/polkit-1 %make_build
%install %install
# install explicitly into libexec. upstream has some unflexible logic for %make_install
# 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
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
# create $HOME for polkit user # create $HOME for polkit user
install -d %{buildroot}%{_localstatedir}/lib/polkit install -d %{buildroot}%{_localstatedir}/lib/polkit
@ -203,9 +198,9 @@ exit 0
%{_bindir}/pkcheck %{_bindir}/pkcheck
%verify(not mode) %attr(4755,root,root) %{_bindir}/pkexec %verify(not mode) %attr(4755,root,root) %{_bindir}/pkexec
%{_bindir}/pkttyagent %{_bindir}/pkttyagent
%dir %{_libexecdir}/polkit-1 %dir %{_prefix}/lib/polkit-1
%{_libexecdir}/polkit-1/polkitd %{_prefix}/lib/polkit-1/polkitd
%verify(not mode) %attr(4755,root,root) %{_libexecdir}/polkit-1/polkit-agent-helper-1 %verify(not mode) %attr(4755,root,root) %{_prefix}/lib/polkit-1/polkit-agent-helper-1
# $HOME for polkit user # $HOME for polkit user
%dir %{_localstatedir}/lib/polkit %dir %{_localstatedir}/lib/polkit
%{_unitdir}/polkit.service %{_unitdir}/polkit.service