[packages/gcr4] move ssh agent into subpackage and drop O: gcr; rel 2
atler
atler at pld-linux.org
Thu Sep 17 13:46:49 CEST 2026
commit 2f6b5089835b65b8a93f4483c71ff535ae296462
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Sep 17 13:36:43 2026 +0200
move ssh agent into subpackage and drop O: gcr; rel 2
avoid conflict with gcr so it's possible to install both in parallel.
gcr4 no longer provides gcr-prompter so it's not really viable
replacement for gcr (except for gnome which provides its own prompter
within gnome-shell). gcr-prompter is most notably required by
pinentry-gnome3 as it's the only implementation providing
"org.gnome.keyring.SystemPrompter" dbus service (independent of running
gnome-shell instance).
gcr4.spec | 40 ++++++++++++++++++++++++++++------------
1 file changed, 28 insertions(+), 12 deletions(-)
---
diff --git a/gcr4.spec b/gcr4.spec
index 1ba4bf9..5cfe40f 100644
--- a/gcr4.spec
+++ b/gcr4.spec
@@ -6,7 +6,7 @@ Summary: GObject and GUI library for high level crypto parsing and display
Summary(pl.UTF-8): Biblioteka GObject i GUI do wysokopoziomowej analizy i wyświetlania danych kryptograficznych
Name: gcr4
Version: 4.4.1
-Release: 1
+Release: 2
License: LGPL v2+
Group: X11/Applications
Source0: https://download.gnome.org/sources/gcr/4.4/gcr-%{version}.tar.xz
@@ -38,9 +38,8 @@ Requires(post,preun,postun): systemd-units >= 1:250.1
Requires: gnupg2 >= 2.0
Requires: libsecret >= 0.20
Requires: systemd-units >= 1:250.1
+Suggests: %{name}-ssh-agent = %{version}-%{release}
Conflicts: gnome-keyring < 3.3.0
-Provides: gcr = %{version}
-Obsoletes: gcr < 4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -104,6 +103,20 @@ gcr and gck API for Vala language.
%description -n vala-gcr4 -l pl.UTF-8
API gcr i gck dla języka Vala.
+%package ssh-agent
+Summary: SSH agent using gcr4
+Summary(pl.UTF-8): Agent SSH wykorzystujący gcr4
+Group: Applications
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Conflicts: gcr-ssh-agent
+
+%description ssh-agent
+SSH agent using gcr4.
+
+%description ssh-agent -l pl.UTF-8
+Agent SSH wykorzystujący gcr4.
+
%package apidocs
Summary: gcr and gck API documentation
Summary(pl.UTF-8): Dokumentacja API bibliotek gcr i gck
@@ -146,26 +159,23 @@ install -d $RPM_BUILD_ROOT%{_gidocdir}
%clean
rm -rf $RPM_BUILD_ROOT
-%post
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%post ssh-agent
%systemd_user_post gcr-ssh-agent.service
-%preun
+%preun ssh-agent
%systemd_user_preun gcr-ssh-agent.service
-%postun
+%postun ssh-agent
%systemd_user_postun_with_restart gcr-ssh-agent.service
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
%files -f gcr-4.lang
%defattr(644,root,root,755)
%doc CONTRIBUTING.md NEWS README.md
%attr(755,root,root) %{_bindir}/gcr-viewer-gtk4
-%attr(755,root,root) %{_libexecdir}/gcr-ssh-agent
%attr(755,root,root) %{_libexecdir}/gcr4-ssh-askpass
-%{systemduserunitdir}/gcr-ssh-agent.service
-%{systemduserunitdir}/gcr-ssh-agent.socket
%files libs
%defattr(644,root,root,755)
@@ -194,6 +204,12 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/vala/vapi/gcr-4.deps
%{_datadir}/vala/vapi/gcr-4.vapi
+%files ssh-agent
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/gcr-ssh-agent
+%{systemduserunitdir}/gcr-ssh-agent.service
+%{systemduserunitdir}/gcr-ssh-agent.socket
+
%if %{with apidocs}
%files apidocs
%defattr(644,root,root,755)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gcr4.git/commitdiff/2f6b5089835b65b8a93f4483c71ff535ae296462
More information about the pld-cvs-commit
mailing list