From e4be4e4a0420d50066121a4d95e372363b78311e Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Wed, 22 Sep 2021 13:32:31 -0500 Subject: [PATCH] Drop dependency on libcapng Drop cap_ipc_lock to unbreak the D-Bus service Fixes #2005625 --- gnome-keyring.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnome-keyring.spec b/gnome-keyring.spec index 78b72b4..da0ad8d 100644 --- a/gnome-keyring.spec +++ b/gnome-keyring.spec @@ -4,7 +4,7 @@ Name: gnome-keyring Version: 40.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Framework for managing passwords and other secrets License: GPLv2+ and LGPLv2+ @@ -19,7 +19,6 @@ BuildRequires: docbook-style-xsl BuildRequires: gcc BuildRequires: gettext BuildRequires: intltool -BuildRequires: libcap-ng-devel BuildRequires: libgcrypt-devel >= %{gcrypt_version} BuildRequires: libselinux-devel BuildRequires: pam-devel @@ -57,7 +56,8 @@ automatically unlock the "login" keyring when the user logs in. %build %configure \ --with-pam-dir=%{_libdir}/security \ - --enable-pam + --enable-pam \ + --without-libcap-ng # avoid unneeded direct dependencies sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool @@ -85,7 +85,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la %dir %{_libdir}/pkcs11 %{_libdir}/pkcs11/*.so # GPL -%attr(0755,root,root) %caps(cap_ipc_lock=ep) %{_bindir}/gnome-keyring-daemon +%{_bindir}/gnome-keyring-daemon %{_bindir}/gnome-keyring %{_bindir}/gnome-keyring-3 %{_datadir}/dbus-1/services/*.service @@ -105,6 +105,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la %changelog +* Tue Sep 21 2021 Michael Catanzaro - 40.0-3 +- Drop dependency on libcapng +- Drop cap_ipc_lock to unbreak the D-Bus service +- Fixes #2005625 + * Thu Jul 22 2021 Fedora Release Engineering - 40.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild