diff --git a/plasma-workspace-5.21-ssh-agent.patch b/plasma-workspace-5.21-ssh-agent.patch deleted file mode 100644 index 06bd493..0000000 --- a/plasma-workspace-5.21-ssh-agent.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 - Requires=plasma-core.target xdg-desktop-autostart.target graphical-session.target --Wants=plasma-kwin_%i.service plasma-restoresession.service plasma-xembedsniproxy.service plasma-gmenudbusmenuproxy.service plasma-powerdevil.service plasma-ksplash-ready.service plasma-polkit-agent.service plasma-baloo.service plasma-foreground-booster.service -+Wants=plasma-kwin_%i.service plasma-restoresession.service plasma-xembedsniproxy.service plasma-gmenudbusmenuproxy.service plasma-powerdevil.service plasma-ksplash-ready.service plasma-polkit-agent.service plasma-baloo.service plasma-foreground-booster.service ssh-agent.service - BindsTo=graphical-session.target - Before=graphical-session.target xdg-desktop-autostart.target plasma-ksplash-ready.service plasma-restoresession.service diff --git a/plasma-workspace.spec b/plasma-workspace.spec index d3dfef1..814850a 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -14,7 +14,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.22.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -50,11 +50,15 @@ Source30: breezetwilight-defaults Source31: breezetwilight-fullscreenpreview.jpg Source32: breezetwilight-preview.png +## systemd user service dependencies +## (debating whether these be owned here or somewhere better... +## in the repective pkgs themselves? -- rdieter) +Source40: ssh-agent.conf +Source41: spice-vdagent.conf + ## downstream Patches Patch100: plasma-workspace-5.21.90-konsole-in-contextmenu.patch Patch101: plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch -# add dependency on ssh-agent.service -Patch102: plasma-workspace-5.21-ssh-agent.patch # default to folderview (instead of desktop) containment, see also # https://mail.kde.org/pipermail/distributions/2016-July/000133.html # and example, @@ -124,7 +128,6 @@ BuildRequires: kf5-kactivities-stats-devel >= %{kf5_version_min} BuildRequires: kf5-kcmutils-devel >= %{kf5_version_min} BuildRequires: kf5-kcrash-devel >= %{kf5_version_min} BuildRequires: kf5-kdeclarative-devel >= %{kf5_version_min} -BuildRequires: kf5-kdelibs4support-devel >= %{kf5_version_min} BuildRequires: kf5-kdesu-devel >= %{kf5_version_min} BuildRequires: kf5-kdoctools-devel >= %{kf5_version_min} BuildRequires: kf5-kglobalaccel-devel >= %{kf5_version_min} @@ -429,7 +432,6 @@ BuildArch: noarch sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfeel:org.kde.breeze.desktop}|g" \ shell/packageplugins/lookandfeel/lookandfeel.cpp %endif -%patch102 -p1 %patch105 -p1 %if 0%{?fedora} @@ -491,6 +493,13 @@ install -m644 -p -D %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/kde # Make kdestart use systemd install -m644 -p -D %{SOURCE11} %{buildroot}%{_sysconfdir}/xdg/startkderc +# systemd user service deps +mkdir -p %{buildroot}%{_userunitdir}/plasma-core.target.d/ +mkdir -p %{buildroot}%{_userunitdir}/plasma-workspace@.target.d/ + +install -m644 -p -D %{SOURCE40} %{buildroot}%{_userunitdir}/plasma-core.target.d/ssh-agent.conf +install -m644 -p -D %{SOURCE41} %{buildroot}%{_userunitdir}/plasma-core.target.d/spice-vdagent.conf + %find_lang all --with-html --all-name grep "%{_kf5_docdir}" all.lang > %{name}-doc.lang @@ -594,8 +603,13 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_kf5_datadir}/kpackage/kcms/kcm_notifications/ %{_kf5_datadir}/kpackage/kcms/kcm_style/ %{_kf5_datadir}/polkit-1/actions/org.kde.fontinst.policy -%{_userunitdir}/* - +%{_userunitdir}/*.service +%{_userunitdir}/plasma-core.target +%dir %{_userunitdir}/plasma-core.target.d/ +%{_userunitdir}/plasma-core.target.d/ssh-agent.conf +%{_userunitdir}/plasma-core.target.d/spice-vdagent.conf +%{_userunitdir}/plasma-workspace.target +%dir %{_userunitdir}/plasma-workspace@.target.d/ # PAM %config(noreplace) %{_sysconfdir}/pam.d/kde %exclude %{_kf5_datadir}/kservices5/plasma-dataengine-geolocation.desktop @@ -717,6 +731,10 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Fri Jul 16 2021 Rex Dieter - 5.22.3-2 +- add (modularized) user service dependencies for ssh-agent, spice-vdagent +- drop BR: kf5-kdelibs4support + * Mon Jul 12 2021 Jan Grulich - 5.22.3-1 - 5.22.3 diff --git a/spice-vdagent.conf b/spice-vdagent.conf new file mode 100644 index 0000000..16c2c22 --- /dev/null +++ b/spice-vdagent.conf @@ -0,0 +1,2 @@ +[Unit] +Wants=spice-vdagent.service diff --git a/ssh-agent.conf b/ssh-agent.conf new file mode 100644 index 0000000..f6a174f --- /dev/null +++ b/ssh-agent.conf @@ -0,0 +1,3 @@ +[Unit] +Before=ssh-agent.service +Wants=ssh-agent.service