[rpms/fedora-release] f45: Remove earlyoom preset from workstation and kde identities

[rpms/fedora-release] f45: Remove earlyoom preset from workstation and kde identities

[Michel Alexandre Salim]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 4066b629cc1cc2d2e35f3c752a9d671a484fdba3
            Author : Michel Alexandre Salim <salimma@fedoraproject.org>
            Date   : 2021-02-16T20:38:25-08:00
            Stats  : +5/-10 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/4066b629cc1cc2d2e35f3c752a9d671a484fdba3?branch=f45

            Log:
            Remove earlyoom preset from workstation and kde identities
  (replaced by systemd-oomd)

https://fedoraproject.org/wiki/Changes/EnableSystemdOomd

Signed-off-by: Michel Alexandre Salim <michel@michel-slm.name>

---
diff --git a/80-kde.preset b/80-kde.preset
deleted file mode 100644
index 7997042..0000000
--- a/80-kde.preset
+++ /dev/null
@@ -1,2 +0,0 @@
-# enable earlyoom by default on KDE
-enable earlyoom.service

diff --git a/80-workstation.preset b/80-workstation.preset
index 3b4d07a..cd6a6ee 100644
--- a/80-workstation.preset
+++ b/80-workstation.preset
@@ -14,10 +14,6 @@ enable cups.socket
 enable cups.path
 disable cups.service
 
-# enable earlyoom by default on workstation
-# https://pagure.io/fedora-workstation/issue/119
-enable earlyoom.service
-
 # enable thermald by default on workstation
 # https://pagure.io/fedora-workstation/issue/71
 enable thermald.service

diff --git a/fedora-release.spec b/fedora-release.spec
index 51a234f..32a3217 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -58,7 +58,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        35
-Release:        0.10%{?eln:.eln%{eln}}
+Release:        0.2%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -80,7 +80,6 @@ Source21:       gnome-shell.conf
 Source22:       80-coreos.preset
 Source23:       zezere-ignition-url
 Source24:       80-iot-user.preset
-Source25:       80-kde.preset
 
 BuildArch:      noarch
 
@@ -922,7 +921,6 @@ echo "VARIANT=\"KDE Plasma\"" >> %{buildroot}%{_prefix}/lib/os-release.kde
 echo "VARIANT_ID=kde" >> %{buildroot}%{_prefix}/lib/os-release.kde
 sed -i -e "s|(%{release_name}%{?prerelease})|(KDE Plasma%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.kde
 sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/KDE/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kde
-install -Dm0644 %{SOURCE25} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
 %endif
 
 %if %{with matecompiz}
@@ -1158,7 +1156,6 @@ 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
 %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kde
 %endif
 
@@ -1230,6 +1227,10 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
 
 
 %changelog
+* Tue Feb 16 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 35-0.2
+- Remove earlyoom preset from workstation and kde identities
+  (replaced by systemd-oomd)
+
 * Tue Feb 09 2021 Tomas Hrcka <thrcka@redhat.com> - 35-0.1
 - Setup for rawhide being F35