rpms/gnome-keyring
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Build with --disable-ssh-agent

Browse Source 
The SSH functionality of gnome-keyring has been moved to gcr [1] as
part of the ModularGnomeKeyring Fedora change [2] proposal. And
currently the SSH functionality is provided by `gcr-ssh-agent`.
This change reflects the upstream default build instructions change [3].

[1] https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67
[2] https://fedoraproject.org/wiki/Changes/ModularGnomeKeyring
[3] https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/60

Signed-off-by: Dhanuka Warusadura <dhanuka@gnome.org>
This commit is contained in:
Dhanuka Warusadura 2023-10-19 16:34:50 +05:30
parent faaf15a614
commit 2c82d29f9b
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnome-keyring.spec
View File

@ -2,6 +2,8 @@
%global gcr_version 3.27.90 %global gcr_version 3.27.90
%global gcrypt_version 1.2.2 %global gcrypt_version 1.2.2
%bcond_with ssh_agent
Name: gnome-keyring Name: gnome-keyring
Version: 42.1 Version: 42.1
Release: 5%{?dist} Release: 5%{?dist}
@ -28,12 +30,16 @@ BuildRequires: libselinux-devel
BuildRequires: make BuildRequires: make
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
%if %{with ssh_agent}
BuildRequires: /usr/bin/ssh-add BuildRequires: /usr/bin/ssh-add
BuildRequires: /usr/bin/ssh-agent BuildRequires: /usr/bin/ssh-agent
%endif
BuildRequires: /usr/bin/xsltproc BuildRequires: /usr/bin/xsltproc
%if %{with ssh_agent}
Requires: /usr/bin/ssh-add Requires: /usr/bin/ssh-add
Requires: /usr/bin/ssh-agent Requires: /usr/bin/ssh-agent
%endif
# for /usr/libexec/gcr-ssh-askpass # for /usr/libexec/gcr-ssh-askpass
Requires: gcr3 Requires: gcr3
@ -65,7 +71,10 @@ automatically unlock the "login" keyring when the user logs in.
--enable-pam \ --enable-pam \
--with-systemd \ --with-systemd \
--without-libcap-ng \ --without-libcap-ng \
--with-pkcs11-config=%{_datadir}/p11-kit/modules --with-pkcs11-config=%{_datadir}/p11-kit/modules \
%if %{without ssh_agent}
--disable-ssh-agent
%endif
# 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
@ -120,6 +129,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/gnome-keyring/devel/*.la
%changelog %changelog
* Fri Oct 20 2023 Dhanuka Warusadura <dhanuka@gnome.org> - 42.1-6
- ssh-agent: update build instructions to disable ssh component
- Introduced conditional builds based on ssh component required or not
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 42.1-5 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 42.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild