[rpms/fedora-release] f45: Shuffle some power/resource management presets so all variants can use them

[rpms/fedora-release] f45: Shuffle some power/resource management presets so all variants can use them

[Neal Gompa]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : c90e03c7dcab1911efd5d0fc414483e9767cb064
            Author : Neal Gompa <ngompa@fedoraproject.org>
            Date   : 2021-07-26T06:29:18-04:00
            Stats  : +16/-12 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/c90e03c7dcab1911efd5d0fc414483e9767cb064?branch=f45

            Log:
            Shuffle some power/resource management presets so all variants can use them

These presets are generally useful for all variants, so it's worth
having these enabled in a way that everyone can take advantage of
them if they are installed.

---
diff --git a/80-workstation.preset b/80-workstation.preset
index cd6a6ee..a5decc8 100644
--- a/80-workstation.preset
+++ b/80-workstation.preset
@@ -14,17 +14,6 @@ enable cups.socket
 enable cups.path
 disable cups.service
 
-# enable thermald by default on workstation
-# https://pagure.io/fedora-workstation/issue/71
-enable thermald.service
-
-# enable uresourced by default on workstation
-# https://pagure.io/fesco/issue/2457
-enable uresourced.service
-
 # enable low-memory-monitor for GMemoryMonitor API
 enable low-memory-monitor.service
 
-# enable power-profiles-daemon
-# https://pagure.io/fedora-workstation/issue/191
-enable power-profiles-daemon.service

diff --git a/90-default.preset b/90-default.preset
index 6ffce7a..7a596e7 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -328,3 +328,15 @@ enable google-shutdown-scripts.service
 # Certbot (Let's Encrypt)
 # https://bugzilla.redhat.com/show_bug.cgi?id=1940211
 enable certbot-renew.timer
+
+# enable thermald by default for desktops
+# https://pagure.io/fedora-workstation/issue/71
+enable thermald.service
+
+# enable uresourced by default for desktops
+# https://pagure.io/fesco/issue/2457
+enable uresourced.service
+
+# enable power-profiles-daemon
+# https://pagure.io/fedora-workstation/issue/191
+enable power-profiles-daemon.service

diff --git a/fedora-release.spec b/fedora-release.spec
index fc6766b..fcc35bb 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -60,7 +60,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        35
-Release:        0.12%{?eln:.eln%{eln}}
+Release:        0.13%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -1328,6 +1328,9 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
 
 
 %changelog
+* Mon Jul 26 2021 Neal Gompa <ngompa@fedoraproject.org> - 35-0.13
+- Shuffle some power/resource management presets so all variants can use them
+
 * Fri Jul 23 2021 Neal Gompa <ngompa@fedoraproject.org> - 35-0.12
 - user session: drop duplicate pipewire-pulse preset