From 74a9875596aa9b2682e1ed08c36c9769b92d44c2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 1 Mar 2021 13:21:07 -0600 Subject: [PATCH] plasma-core.target: +Before=ssh-agent.service Add Before=ssh-agent.service here instead of adding After=plasma-core.target in ssh-agent.service, in the hopes of keeping that one as DE agnostic as possible --- plasma-workspace-5.21-ssh-agent.patch | 15 ++++++++++++--- plasma-workspace.spec | 5 ++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/plasma-workspace-5.21-ssh-agent.patch b/plasma-workspace-5.21-ssh-agent.patch index 24b2bdb..06bd493 100644 --- a/plasma-workspace-5.21-ssh-agent.patch +++ b/plasma-workspace-5.21-ssh-agent.patch @@ -1,6 +1,15 @@ -diff -up plasma-workspace-5.21.1/startkde/systemd/plasma-workspace@.target.ssh-agent plasma-workspace-5.21.1/startkde/systemd/plasma-workspace@.target ---- plasma-workspace-5.21.1/startkde/systemd/plasma-workspace@.target.ssh-agent 2021-02-23 07:09:21.000000000 -0600 -+++ plasma-workspace-5.21.1/startkde/systemd/plasma-workspace@.target 2021-02-25 11:15:28.906881561 -0600 +diff -up plasma-workspace-5.21.1/startkde/systemd/plasma-core.target.ssh_agent plasma-workspace-5.21.1/startkde/systemd/plasma-core.target +--- plasma-workspace-5.21.1/startkde/systemd/plasma-core.target.ssh_agent 2021-02-23 07:09:21.000000000 -0600 ++++ plasma-workspace-5.21.1/startkde/systemd/plasma-core.target 2021-03-01 13:07:40.558916195 -0600 +@@ -4,4 +4,5 @@ Wants=plasma-plasmashell.service plasma- + Requires=plasma-ksmserver.service + BindsTo=plasma-ksmserver.service + After=graphical-session-pre.target ++Before=ssh-agent.service + RefuseManualStart=yes +diff -up plasma-workspace-5.21.1/startkde/systemd/plasma-workspace@.target.ssh_agent plasma-workspace-5.21.1/startkde/systemd/plasma-workspace@.target +--- plasma-workspace-5.21.1/startkde/systemd/plasma-workspace@.target.ssh_agent 2021-02-23 07:09:21.000000000 -0600 ++++ plasma-workspace-5.21.1/startkde/systemd/plasma-workspace@.target 2021-03-01 13:06:44.734705478 -0600 @@ -1,6 +1,6 @@ [Unit] Description=KDE Plasma Workspace diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 01ade31..9f17523 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -14,7 +14,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.21.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -721,6 +721,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Mon Mar 01 2021 Rex Dieter - 5.21.1-4 +- plasma-core.target: +Before=ssh-agent.service + * Thu Feb 25 2021 Rex Dieter - 5.21.1-3 - plasma-workspace@.target: Wants += ssh-agent.service (#1761817)