[rpms/fedora-release] f45: Add NetworkManager to list of protected packages in Workstation

[rpms/fedora-release] f45: Add NetworkManager to list of protected packages in Workstation

[Michael Catanzaro]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 7fb6694308d8ddfcc5b7789ca81ab477fa04c286
            Author : Michael Catanzaro <mcatanzaro@redhat.com>
            Date   : 2022-02-01T09:35:31-06:00
            Stats  : +5/-4 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/7fb6694308d8ddfcc5b7789ca81ab477fa04c286?branch=f45

            Log:
            Add NetworkManager to list of protected packages in Workstation

You may want to remove NetworkManager if using another Fedora variant,
but Workstation users should remove the Workstation identity if this is
desired.

This renames the existing gnome-shell.conf protected packages list to
fedora-workstation.conf, so we can list multiple packages without a
separate config file for each one.

https://pagure.io/fedora-workstation/issue/260

---
diff --git a/fedora-release.spec b/fedora-release.spec
index 3706c65..7fdbb80 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -85,7 +85,7 @@ Source17:       org.projectatomic.rpmostree1.rules
 Source18:       80-iot.preset
 Source19:       distro-template.swidtag
 Source20:       distro-edition-template.swidtag
-Source21:       gnome-shell.conf
+Source21:       fedora-workstation.conf
 Source22:       80-coreos.preset
 Source23:       zezere-ignition-url
 Source24:       80-iot-user.preset
@@ -1109,7 +1109,7 @@ echo "VARIANT=\"Workstation Edition\"" >> %{buildroot}%{_prefix}/lib/os-release.
 echo "VARIANT_ID=workstation" >> %{buildroot}%{_prefix}/lib/os-release.workstation
 sed -i -e "s|(%{release_name}%{?prerelease})|(Workstation Edition%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.workstation
 sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Workstation/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.workstation
-# Add gnome-shell to dnf protected packages list for Workstation
+# Add Fedora Workstation dnf protected packages list
 install -Dm0644 %{SOURCE21} -t %{buildroot}%{_sysconfdir}/dnf/protected.d/
 %endif
 
@@ -1382,7 +1382,7 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
 %files identity-workstation
 %{_prefix}/lib/os-release.workstation
 %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.workstation
-%{_sysconfdir}/dnf/protected.d/gnome-shell.conf
+%{_sysconfdir}/dnf/protected.d/fedora-workstation.conf
 # 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

diff --git a/fedora-workstation.conf b/fedora-workstation.conf
new file mode 100644
index 0000000..a42f38b
--- /dev/null
+++ b/fedora-workstation.conf
@@ -0,0 +1,2 @@
+NetworkManager
+gnome-shell

diff --git a/gnome-shell.conf b/gnome-shell.conf
deleted file mode 100644
index c3d0e0c..0000000
--- a/gnome-shell.conf
+++ /dev/null
@@ -1 +0,0 @@
-gnome-shell