From 12725f25c64984bd4d2bf2c7c5d251b81d587c8c Mon Sep 17 00:00:00 2001
From: nazunalika <label@rockylinux.org>
Date: Sat, 7 May 2022 09:14:54 -0700
Subject: [PATCH] update metadata

---
 patch.yml | 51 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/patch.yml b/patch.yml
index 08e206a..38e0b51 100644
--- a/patch.yml
+++ b/patch.yml
@@ -1,6 +1,7 @@
 # Packages that are patched or debranded
 # build_patch: These needed modifications to build properly or they are being
-#              addressed for other issues that isn't done upstream.
+#              addressed for other issues that isn't done upstream. These show
+#              what branch has patches applied.
 # previous: These are previously patched packages that are no longer patched in
 #           Rocky as they are upstreamed or it was found no longer required.
 # provides: These are specific branded packages that provide something else
@@ -8,13 +9,26 @@
 # dnt: Do Not Touch - These are for packages that "appear" to need to be 
 #      debranded, but that is not the case.
 # debrand: Packages that need trademarks removed/changed for Rocky to remove
-#          Red Hat references.
+#          Red Hat references or to decouple packages from Red Hat specific
+#          software like subscription-manager. These are not "branch" specific
+#          at all and only indicate what major release has debranding applied.
 ---
-build_patch: []
+build_patch:
+  r8:
+    - rpm-ostree
+  r8-stream-10.3:
+    - mariadb
+  r8-stream-2.6:
+    - ruby
+  r8-stream-2.7:
+    - python-psycopg2
+  r8:
+    - python-cups
 previous:
   - ipa
 provides:
-  base-module(platform:elX): rocky-release
+  base-module(platform:el8): rocky-release
+  base-module(platform:el9): rocky-release
   centos-release: rocky-release
   centos-release-eula: rocky-release
   redhat-release: rocky-release
@@ -33,47 +47,60 @@ provides:
 dnt:
   all:
     - redhat-fonts
+# Version specific, does not indicate branch names.
 debrand:
   r8:
-    - anaconda
     - dotnet3.0
     - fwupdate
+    - gnome-boxes
     - libguestfs            # temporary
-    - osinfo-db             # temporary, might be needed for 9 temporarily
-    - pcs                   ## Might be needed for 9
-    - pesign                # temporary for 9, may end up being replaced
+    - pcs                   # Might be needed for 9
+    - plymouth
     - python2
   r9:
     - libguestfs            # temporary
   all:
     - abrt
+    - anaconda
     - anaconda-user-help
     - chrony
-    - cloud-init            # temporary, upstreamed
+    - cloud-init            # temporary till 21.3
+    - cockpit
     - crash
+    - dhcp
     - dnf
     - firefox
     - fwupd
+    - gcc
+    - gcc-toolset-9-gcc
+    - gcc-toolset-10-gcc
+    - gcc-toolset-11-gcc
+    - gcc-toolset-12-gcc
     - gnome-settings-daemon
     - grub2
     - httpd
     - initial-setup
     - kernel
+    - kernel-rt
     - libdnf
     - libreoffice
-    - libreport             ## TODO FOR 9
+    - libreport
     - nginx
     - opa-ff                # temporary
     - opa-fm                # temporary
     - openscap              # temporary, submitting upstream PR
+    - pesign                # temporary for 9, may end up being replaced by sbsigntool
+    - PackageKit
+    - python-pip
     - python3
     - redhat-rpm-config
     - scap-security-guide   # upstream?
     - shim
     - shim-unsigned-x64
     - shim-unsigned-aarch64
-    - sos                   # temporary -> Upstream master branch
+    - sos
     - subscription-manager
+    - systemd
     - thunderbird
-    - WALinuxAgent          ## temporary -> Upstream PR
+    - WALinuxAgent          ## temporary until 2.8.x.y
 ...