pool/polkit
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 859155 from Base:System

Browse Source 
- also set libprivdir during build, otherwhise systemd and D-Bus service files
  contain the wrong path and we'll get runtime errors. (forwarded request 859146 from mgerstner)

OBS-URL: https://build.opensuse.org/request/show/859155
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/polkit?expand=0&rev=72
This commit is contained in:
Dominique Leuenberger 2020-12-30 16:11:54 +00:00 committed by Git OBS Bridge
commit 6d10544d71
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
polkit.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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>

15
polkit.spec
View File

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