[rpms/fedora-release] f45: presets: Use a commmon desktop preset and spin specific ones

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 4c65215bcd6b5d9c7e87963a22d11fb80835d160
            Author : Timothée Ravier <tim@siosm.fr>
            Date   : 2021-11-30T16:23:33+01:00
            Stats  : +30/-16 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/4c65215bcd6b5d9c7e87963a22d11fb80835d160?branch=f45

            Log:
            presets: Use a commmon desktop preset and spin specific ones

Split the 80-workstation.preset into a 81-desktop.preset with presets
common to all Fedora desktop variants and keeps the varaint specific
changes in separated preset files: 80-workstation.preset &
80-kde.preset.

This change is a NOP for Workstation and Silverblue.
This change disables sshd by defaut and switches cups to the socket unit
for the KDE Spin and Kinoite.

See: https://pagure.io/fedora-kde/SIG/issue/126

---
diff --git a/80-kde.preset b/80-kde.preset
new file mode 100644
index 0000000..de70858
--- /dev/null
+++ b/80-kde.preset
@@ -0,0 +1 @@
+# Fedora KDE Spin & Kinoite specific configuration

diff --git a/80-workstation.preset b/80-workstation.preset
index a5decc8..bb66684 100644
--- a/80-workstation.preset
+++ b/80-workstation.preset
@@ -1,19 +1,4 @@
-#
-# Fedora Workstation
-#
-
-# disable sshd socket by default on workstation
-disable sshd.socket
-
-# disable sshd service by default on workstation
-disable sshd.service
-
-# enable cups on-demand socket activation by default on workstation
-# https://pagure.io/fedora-workstation/issue/8
-enable cups.socket
-enable cups.path
-disable cups.service
+# Fedora Workstation & Silverblue specific configuration
 
 # enable low-memory-monitor for GMemoryMonitor API
 enable low-memory-monitor.service
-

diff --git a/81-desktop.preset b/81-desktop.preset
new file mode 100644
index 0000000..7db49d6
--- /dev/null
+++ b/81-desktop.preset
@@ -0,0 +1,13 @@
+# Common configuration for all Fedora desktop variants
+# Workstation & Silverblue specific configuration goes into 80-workstation.preset
+# KDE Spin & Kinoite specific configuration goes into 80-kde.preset
+
+# disable sshd socket and sshd service by default
+disable sshd.socket
+disable sshd.service
+
+# enable cups on-demand socket activation by default
+# https://pagure.io/fedora-workstation/issue/8
+enable cups.socket
+enable cups.path
+disable cups.service

diff --git a/fedora-release.spec b/fedora-release.spec
index f254cde..3706c65 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -90,6 +90,8 @@ Source22:       80-coreos.preset
 Source23:       zezere-ignition-url
 Source24:       80-iot-user.preset
 Source25:       plasma-desktop.conf
+Source26:       80-kde.preset
+Source27:       81-desktop.preset
 
 BuildArch:      noarch
 
@@ -1114,10 +1116,17 @@ install -Dm0644 %{SOURCE21} -t %{buildroot}%{_sysconfdir}/dnf/protected.d/
 %if %{with silverblue} || %{with workstation}
 # Silverblue and Workstation
 install -Dm0644 %{SOURCE15} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
+install -Dm0644 %{SOURCE27} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
 # Override the list of enabled gnome-shell extensions for Workstation
 install -Dm0644 %{SOURCE16} -t %{buildroot}%{_datadir}/glib-2.0/schemas/
 %endif
 
+%if %{with kde} || %{with kinoite}
+# Common desktop preset and spin specific preset
+install -Dm0644 %{SOURCE26} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
+install -Dm0644 %{SOURCE27} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
+%endif
+
 %if %{with silverblue} || %{with kinoite}
 # Install rpm-ostree polkit rules
 install -Dm0644 %{SOURCE17} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
@@ -1298,6 +1307,8 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
 %files kde
 %files identity-kde
 %{_prefix}/lib/os-release.kde
+%{_prefix}/lib/systemd/system-preset/80-kde.preset
+%{_prefix}/lib/systemd/system-preset/81-desktop.preset
 %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kde
 %{_sysconfdir}/dnf/protected.d/plasma-desktop.conf
 %endif
@@ -1328,6 +1339,7 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
 # Keep this in sync with workstation below
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.override
 %{_prefix}/lib/systemd/system-preset/80-workstation.preset
+%{_prefix}/lib/systemd/system-preset/81-desktop.preset
 %{_unitdir}/timers.target.wants/rpm-ostree-countme.timer
 %endif
 
@@ -1336,6 +1348,8 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
 %files kinoite
 %files identity-kinoite
 %{_prefix}/lib/os-release.kinoite
+%{_prefix}/lib/systemd/system-preset/80-kde.preset
+%{_prefix}/lib/systemd/system-preset/81-desktop.preset
 %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kinoite
 %{_unitdir}/timers.target.wants/rpm-ostree-countme.timer
 %endif
@@ -1372,6 +1386,7 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
 # Keep this in sync with silverblue above
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.override
 %{_prefix}/lib/systemd/system-preset/80-workstation.preset
+%{_prefix}/lib/systemd/system-preset/81-desktop.preset
 %endif