[rpms/fedora-release] f45: workstation/silverblue: Add third-party repositories

[rpms/fedora-release] f45: workstation/silverblue: Add third-party repositories

[Owen W. Taylor]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 1f4fd47db2a45c9747dc5b6cc5ac50a7d43769d0
            Author : Owen W. Taylor <otaylor@fishsoup.net>
            Date   : 2021-08-17T14:07:13-04:00
            Stats  : +12/-0 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/1f4fd47db2a45c9747dc5b6cc5ac50a7d43769d0?branch=f45

            Log:
            workstation/silverblue: Add third-party repositories

Make fedora-release-workstation and fedora-release-silverblue
Requires(meta): the fedora-workstation-repositories and
fedora-flathub-remote packages that provide our recommended
third-party repositories, so that they get installed on upgrades as well
as new installs.

(The repositories are disabled in packaging and only enabled by the
fedora-third-party tool if the system is opted in.)

https://fedoraproject.org/wiki/Changes/Third_Party_Software_Mechanism
https://fedoraproject.org/wiki/Changes/Filtered_Flathub_Applications

Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>

---
diff --git a/fedora-release.spec b/fedora-release.spec
index 7282cb1..7e4b057 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -582,6 +582,12 @@ Requires:       fedora-release-common = %{version}-%{release}
 Requires:       fedora-release-ostree-counting = %{version}-%{release}
 Requires:       fedora-release-ostree-desktop = %{version}-%{release}
 
+# Third-party repositories, disabled by default unless the user opts in through fedora-third-party
+# Requires(meta) to avoid ordering loops - does not need to be installed before the release package
+# Keep this in sync with workstation below
+Requires(meta):	fedora-flathub-remote
+Requires(meta):	fedora-workstation-repositories
+
 # fedora-release-common Requires: fedora-release-identity, so at least one
 # package must provide it. This Recommends: pulls in
 # fedora-release-identity-silverblue if nothing else is already doing so.
@@ -751,6 +757,12 @@ Provides:       base-module(platform:f%{version})
 Requires:       fedora-release-common = %{version}-%{release}
 Provides:       system-release-product
 
+# Third-party repositories, disabled by default unless the user opts in through fedora-third-party
+# Requires(meta) to avoid ordering loops - does not need to be installed before the release package
+# Keep this in sync with silverblue above
+Requires(meta):	fedora-flathub-remote
+Requires(meta):	fedora-workstation-repositories
+
 # fedora-release-common Requires: fedora-release-identity, so at least one
 # package must provide it. This Recommends: pulls in
 # fedora-release-identity-workstation if nothing else is already doing so.