Install PKCS#11 module config under /usr/share
This partially reverts a1aff4e992
so the
PKCS#11 module configuration is installed under immutable location,
instead of /etc.
This also makes the spec file future-proof after the upstream changes
in gnome-keyring and p11-kit:
https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/54
https://github.com/p11-glue/p11-kit/pull/412
Signed-off-by: Daiki Ueno <dueno@redhat.com>
This commit is contained in:
parent
2570ab951a
commit
658abffaac
@ -62,7 +62,8 @@ automatically unlock the "login" keyring when the user logs in.
|
|||||||
--with-pam-dir=%{_libdir}/security \
|
--with-pam-dir=%{_libdir}/security \
|
||||||
--enable-pam \
|
--enable-pam \
|
||||||
--with-systemd \
|
--with-systemd \
|
||||||
--without-libcap-ng
|
--without-libcap-ng \
|
||||||
|
--with-pkcs11-config=%{_datadir}/p11-kit/modules
|
||||||
|
|
||||||
# avoid unneeded direct dependencies
|
# avoid unneeded direct dependencies
|
||||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
|
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
|
||||||
@ -99,10 +100,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
|
|||||||
%{_bindir}/gnome-keyring
|
%{_bindir}/gnome-keyring
|
||||||
%{_bindir}/gnome-keyring-3
|
%{_bindir}/gnome-keyring-3
|
||||||
%{_datadir}/dbus-1/services/*.service
|
%{_datadir}/dbus-1/services/*.service
|
||||||
%{_sysconfdir}/pkcs11/modules/gnome-keyring.module
|
|
||||||
%{_sysconfdir}/xdg/autostart/*
|
%{_sysconfdir}/xdg/autostart/*
|
||||||
%{_datadir}/GConf/gsettings/*.convert
|
%{_datadir}/GConf/gsettings/*.convert
|
||||||
%{_datadir}/glib-2.0/schemas/*.gschema.xml
|
%{_datadir}/glib-2.0/schemas/*.gschema.xml
|
||||||
|
%{_datadir}/p11-kit/modules/gnome-keyring.module
|
||||||
%dir %{_datadir}/xdg-desktop-portal
|
%dir %{_datadir}/xdg-desktop-portal
|
||||||
%dir %{_datadir}/xdg-desktop-portal/portals
|
%dir %{_datadir}/xdg-desktop-portal/portals
|
||||||
%{_datadir}/xdg-desktop-portal/portals/gnome-keyring.portal
|
%{_datadir}/xdg-desktop-portal/portals/gnome-keyring.portal
|
||||||
|
Loading…
Reference in New Issue
Block a user