From ec037fe32e0329568bb1925751411f4b11703b1f Mon Sep 17 00:00:00 2001
From: nazunalika <label@rockylinux.org>
Date: Sun, 8 May 2022 22:13:00 -0700
Subject: [PATCH] Fixes and Additions

* Updated debrand list
* Updated previous list to be consistent
* Update patch list for builds
---
 patch.yml | 133 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 122 insertions(+), 11 deletions(-)

diff --git a/patch.yml b/patch.yml
index f4cde66..9f65b00 100644
--- a/patch.yml
+++ b/patch.yml
@@ -4,7 +4,8 @@
 #              what branch has patches applied.
 # plus: These packages are modified versions of base packages to add features
 #       not available or patched out by upstream. These are potentially packages
-#       that should be available in the main distribution but are not.
+#       that should be available in the main distribution but are not, such as
+#       the servers package from openldap.
 # 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
@@ -12,28 +13,128 @@
 # 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 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.
+#          Red Hat references, replace RH with Rocky (such as URLs) or to
+#          decouple packages from Red Hat specificsoftware like
+#          subscription-manager. These are not "branch" specific at all and only
+#          indicate what major release has debranding applied. Note that not
+#          every package has a changelog message that uses "debrand" as a word
+#          nor do changelogs indicate a simple URL change (eg in the spec file).
+#
+#          This should be used as a method of tracking.
+#
+# override_required: Requires the rocky-release override package to fake "rhel"
+#                    as an ID to build properly. Usually only needed for dotnet
 ---
 build_patch:
+  all:
+    - libguestfs          # needed to force REDHAT as build for now
   r8:
+    - beignet
+    - ceph
+    - clufter
+    - compat-guile18
+    - efibootmgr
+    - fontforge
+    - gegl04
+    - gflags
+    - gomtree
+    - ibus-typing-booster
+    - jss
+    - kyotocabinet
+    - libucil
+    - mariadb
+    - mesa-libGLU
+    - nss-softokn
+    - perl-AnyEvent
+    - perl-Net-IDN-Encode
+    - perl-TimeDate
+    - python-cffi
     - python-cups
+    - python-iso8601
+    - python-systemd
     - rpm-ostree
+    - xorg-x11-drv-intel
+    - xorg-x11-drv-qxl
+  r8-stream-1.0:
+    - cobbler
+    - rhncfg
+    - rhnpush
+    - rhn-custom-info
+    - rhn-virtualization
+    - spacewalk-abrt
+    - spacewalk-backend
+    - spacewalk-client-cert
+    - spacewalk-koan
+    - spacewalk-oscap
+    - spacewalk-remote-utils
+    - spacewalk-usix
   r8-stream-10.3:
     - mariadb
   r8-stream-2.6:
     - ruby
   r8-stream-2.7:
     - python-psycopg2
-
+  r8-stream-5.24:
+    - perl
+    - perl-TimeDate
+  r8-stream-5.26:
+    - perl
+    - perl-TimeDate
+    - perl-Time-Local
+  r8-stream-10.3:
+    - mariadb
 plus:
   all:
     - thunderbird
+  r9:
+    - openldap-servers
 previous:
-  - eth-tools # rocky is now upstreamed
-  - httpd     # No longer needed on the index or spec
-  - ipa       # EL should be default in makefile
+  r8:
+    - acl
+    - atlas
+    - audit
+    - autogen
+    - brltty
+    - certmonger
+    - cogl
+    - delve
+    - dotnet3.1               # override is used
+    - dotnet5.0               # override is used
+    - dotnet6.0               # override is used
+    - e2fsprogs
+    - egl-wayland
+    - eth-tools               # rocky is now upstreamed
+    - gcc-toolset-9-elfutils
+    - gcc-toolset-10-elfutils
+    - gnome-characters
+    - gnome-shell-extensions
+    - httpd                   # No longer needed on the index or spec
+    - ipa                     # EL should be default in makefile
+    - jimctl
+    - kmod-redhat-oracleasm   # unable to build
+    - mozjs60
+    - ncurses
+    - nispor
+    - nss
+    - osinfo-db
+    - pandoc
+    - perl-Authen-SASL
+    - perl-File-HomeDir
+    - perl-gettext
+    - python-backports
+    - python-cryptography
+    - python-urllib3
+    - qt5-qtbase
+    - qt5-qtwayland
+    - scrub
+    - SFML
+    - SLOF
+    - spirv-headers           # this is dealt in a custom manner
+    - systemd
+    - tpm2-abrmd
+    - usb_modeswitch
+    - vim
+    - xz
 provides:
   base-module(platform:el8): rocky-release
   base-module(platform:el9): rocky-release
@@ -57,23 +158,34 @@ provides:
 dnt:
   all:
     - redhat-fonts
+override_required:
+  r8:
+    - dotnet3.1
+    - dotnet5.0
+    - dotnet6.0
+  r9:
+    - dotnet6.0
 # Version specific, does not indicate branch names.
 debrand:
   r8:
+    - dotnet
     - dotnet3.0
     - fwupdate
     - gnome-boxes
     - libguestfs            # temporary
+    - open-vm-tools         # temporary till 12.0.0
+    - oscap-anaconda-addon  # change "Red Hat" to "Rocky"
     - pcs                   # Might be needed for 9
     - plymouth
     - python2
+    - python3
   r9:
-    - libguestfs            # temporary
+    - open-vm-tools         # temporary till 12.0.0
   all:
     - abrt
     - anaconda
     - anaconda-user-help
-    - chrony
+    - chrony                # Currently reaching out to get a pool
     - cloud-init            # temporary till 21.3
     - cockpit
     - crash
@@ -101,7 +213,6 @@ debrand:
     - pesign                # temporary for 9, may end up being replaced by sbsigntool
     - PackageKit
     - python-pip
-    - python3
     - redhat-rpm-config
     - scap-security-guide   # upstream?
     - shim