[rpms/fedora-release] f45: Merge #255 `Enable nmstate service`

[rpms/fedora-release] f45: Merge #255 `Enable nmstate service`

[Stephen Gallagher]

A new commit has been pushed.

Repo   : rpms/fedora-release
Branch : f45
Commit : 700d14777ca8522e00ba66410210be65bc8f14d7
Author : Stephen Gallagher <sgallagh@fedoraproject.org>
Date   : 2023-05-26T17:00:47+00:00
Stats  : +132/-5 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/fedora-release/c/700d14777ca8522e00ba66410210be65bc8f14d7?branch=f45

Log:
Merge #255 `Enable nmstate service`

---
diff --git a/90-default.preset b/90-default.preset
index f413464..232c14c 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -381,4 +381,9 @@ enable livesys-late.service
 
 # Enable Waydroid
 # https://bugzilla.redhat.com/show_bug.cgi?id=2157810
-enable waydroid-container.service
\ No newline at end of file
+enable waydroid-container.service
+
+# Enable nmstate to apply network configuration from /etc/nmstate/*.yml
+# https://github.com/coreos/fedora-coreos-tracker/issues/1175
+# https://github.com/coreos/fedora-coreos-config/pull/2269
+enable nmstate.service

diff --git a/90-default.preset b/90-default.preset
index e1a228e..232c14c 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -20,8 +20,6 @@ enable systemd-oomd.service
 enable dbus.socket
 enable dbus-broker.service
 enable sshd.service
-# https://src.fedoraproject.org/rpms/openssh/pull-request/40
-enable ssh-host-keys-migration.service
 
 # Locally-running services
 enable atd.*

diff --git a/fedora-release.spec b/fedora-release.spec
index c17a28e..db679c5 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -40,6 +40,8 @@
 %bcond_with budgie
 %bcond_with sway
 %bcond_with sericea
+%bcond_with onyx
+%bcond_with mobility
 %else
 %bcond_without basic
 %bcond_without cinnamon
@@ -64,9 +66,11 @@
 %bcond_without budgie
 %bcond_without sway
 %bcond_without sericea
+%bcond_without onyx
+%bcond_without mobility
 %endif
 
-%if %{with silverblue} || %{with kinoite} || %{with sericea}
+%if %{with silverblue} || %{with kinoite} || %{with sericea} || %{with onyx}
 %global with_ostree_desktop 1
 %endif
 
@@ -107,6 +111,7 @@ Source25:       plasma-desktop.conf
 Source26:       80-kde.preset
 Source27:       81-desktop.preset
 Source28:       longer-default-shutdown-timeout.conf
+Source29:       org.gnome.settings-daemon.plugins.power.gschema.override
 
 BuildArch:      noarch
 
@@ -1033,6 +1038,81 @@ Provides the necessary files for a Fedora installation that is identifying
 itself as Fedora Sericea.
 %endif
 
+%if %{with onyx}
+%package onyx
+Summary:        Base package for Fedora Onyx specific default configurations
+
+RemovePathPostfixes: .onyx
+Provides:       fedora-release = %{version}-%{release}
+Provides:       fedora-release-variant = %{version}-%{release}
+Provides:       system-release
+Provides:       system-release(%{version})
+Provides:       base-module(platform:f%{version})
+Requires:       fedora-release-common = %{version}-%{release}
+Requires:       fedora-release-ostree-desktop = %{version}-%{release}
+
+# fedora-release-common Requires: fedora-release-identity, so at least one
+# package must provide it. This Recommends: pulls in
+# fedora-release-identity-onyx if nothing else is already doing so.
+Recommends:     fedora-release-identity-onyx
+
+
+%description onyx
+Provides a base package for Fedora Onyx specific configuration
+files to depend on.
+
+
+%package identity-onyx
+Summary:        Package providing the identity for Fedora Onyx
+
+RemovePathPostfixes: .onyx
+Provides:       fedora-release-identity = %{version}-%{release}
+Conflicts:      fedora-release-identity
+Requires(meta): fedora-release-onyx = %{version}-%{release}
+
+
+%description identity-onyx
+Provides the necessary files for a Fedora installation that is identifying
+itself as Fedora Onyx.
+%endif
+
+
+%if %{with mobility}
+%package mobility
+Summary:        Base package for Fedora Mobility specific default configurations
+
+RemovePathPostfixes: .mobility
+Provides:       fedora-release = %{version}-%{release}
+Provides:       fedora-release-variant = %{version}-%{release}
+Provides:       system-release
+Provides:       system-release(%{version})
+Provides:       base-module(platform:f%{version})
+Requires:       fedora-release-common = %{version}-%{release}
+
+# fedora-release-common Requires: fedora-release-identity, so at least one
+# package must provide it. This Recommends: pulls in
+# fedora-release-identity-mobility if nothing else is already doing so.
+Recommends:     fedora-release-identity-mobility
+
+
+%description mobility
+Provides a base package for Fedora Mobility specific configuration
+files to depend on.
+
+
+%package identity-mobility
+Summary:        Package providing the identity for Fedora Mobility
+
+RemovePathPostfixes: .mobility
+Provides:       fedora-release-identity = %{version}-%{release}
+Conflicts:      fedora-release-identity
+Requires(meta): fedora-release-mobility = %{version}-%{release}
+
+
+%description identity-mobility
+Provides the necessary files for a Fedora installation that is identifying
+itself as Fedora Mobility.
+%endif
 
 %prep
 mkdir -p licenses
@@ -1267,6 +1347,9 @@ sed -i -e "s|(%{release_name}%{?prerelease})|(Server Edition%{?prerelease})|g" %
 sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Server/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.server
 sed -i -e "/^DEFAULT_HOSTNAME=/d" %{buildroot}%{_prefix}/lib/os-release.server
 install -Dm0644 %{SOURCE14} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
+install -Dm0644 %{SOURCE29} -t %{buildroot}%{_datadir}/glib-2.0/schemas/
+install -Dm0644 %{SOURCE28} -t %{buildroot}%{_prefix}/lib/systemd/system.conf.d/
+install -Dm0644 %{SOURCE28} -t %{buildroot}%{_prefix}/lib/systemd/user.conf.d/
 %endif
 
 %if %{with silverblue}
@@ -1404,14 +1487,32 @@ cp -p os-release %{buildroot}%{_prefix}/lib/os-release.sericea
 echo "VARIANT=\"Sericea\"" >> %{buildroot}%{_prefix}/lib/os-release.sericea
 echo "VARIANT_ID=sericea" >> %{buildroot}%{_prefix}/lib/os-release.sericea
 sed -i -e "s|(%{release_name}%{?prerelease})|(Sericea%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.sericea
+sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora-sericea/"|' %{buildroot}%{_prefix}/lib/os-release.sericea
+sed -i -e 's|HOME_URL=.*|HOME_URL="https://fedoraproject.org/sericea/"|' %{buildroot}/%{_prefix}/lib/os-release.sericea
 sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://gitlab.com/fedora/sigs/sway/SIG/-/issues"|' %{buildroot}/%{_prefix}/lib/os-release.sericea
 sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Sericea/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.sericea
 %endif
 
+%if %{with onyx}
+cp -p os-release %{buildroot}%{_prefix}/lib/os-release.onyx
+echo "VARIANT=\"Onyx\"" >> %{buildroot}%{_prefix}/lib/os-release.onyx
+echo "VARIANT_ID=onyx" >> %{buildroot}%{_prefix}/lib/os-release.onyx
+sed -i -e "s|(%{release_name}%{?prerelease})|(Onyx%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.onyx
+sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora-onyx/"|' %{buildroot}%{_prefix}/lib/os-release.onyx
+sed -i -e 's|HOME_URL=.*|HOME_URL="https://fedoraproject.org/onyx/"|' %{buildroot}/%{_prefix}/lib/os-release.onyx
+sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Onyx/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.onyx
+%endif
+
+%if %{with mobility}
+cp -p os-release %{buildroot}%{_prefix}/lib/os-release.mobility
+echo "VARIANT=\"Mobility\"" >> %{buildroot}%{_prefix}/lib/os-release.mobility
+echo "VARIANT_ID=mobility" >> %{buildroot}%{_prefix}/lib/os-release.mobility
+sed -i -e "s|(%{release_name}%{?prerelease})|(Mobility%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.mobility
+sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Mobility/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.mobility
+%endif
 # Create the symlink for /etc/os-release
 ln -s ../usr/lib/os-release %{buildroot}%{_sysconfdir}/os-release
 
-
 # Set up the dist tag macros
 install -d -m 755 %{buildroot}%{_rpmconfigdir}/macros.d
 cat >> %{buildroot}%{_rpmconfigdir}/macros.d/macros.dist << EOF
@@ -1584,7 +1685,10 @@ ln -s --relative %{buildroot}%{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swid
 %files identity-server
 %{_prefix}/lib/os-release.server
 %{_prefix}/lib/systemd/system-preset/80-server.preset
+%{_prefix}/lib/systemd/system.conf.d/longer-default-shutdown-timeout.conf
+%{_prefix}/lib/systemd/user.conf.d/longer-default-shutdown-timeout.conf
 %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.server
+%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.power.gschema.override
 %endif
 
 
@@ -1696,6 +1800,24 @@ ln -s --relative %{buildroot}%{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swid
 %{_unitdir}/timers.target.wants/rpm-ostree-countme.timer
 %endif
 
+%if %{with onyx}
+%files onyx
+%files identity-onyx
+%{_prefix}/lib/os-release.onyx
+%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.onyx
+%{_prefix}/lib/systemd/system-preset/81-desktop.preset
+%{_unitdir}/timers.target.wants/rpm-ostree-countme.timer
+%endif
+
+
+%if %{with mobility}
+%files mobility
+%files identity-mobility
+%{_prefix}/lib/os-release.mobility
+%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.mobility
+%{_prefix}/lib/systemd/system-preset/81-desktop.preset
+%endif
+
 
 %changelog
 %autochangelog

diff --git a/org.gnome.settings-daemon.plugins.power.gschema.override b/org.gnome.settings-daemon.plugins.power.gschema.override
new file mode 100644
index 0000000..c6b28c1
--- /dev/null
+++ b/org.gnome.settings-daemon.plugins.power.gschema.override
@@ -0,0 +1,2 @@
+[org.gnome.settings-daemon.plugins.power]
+sleep-inactive-ac-timeout=0