restructure, remove redhat refs in spec

ROCKY/CFG/subscription-manager.cfg

@@ -3,7 +3,7 @@ add {
 }
 
 add {
-  file: "ROCKY/_supporting/subscription-manager-rocky-remove-redhat.repo.patch"
+  file: "ROCKY/_supporting/0001-subscription-manager-rocky-remove-redhat-refs.patch"
 }
 
 spec_change {
@@ -17,7 +17,7 @@ spec_change {
   }
 
   file {
-    name: "subscription-manager-rocky-remove-redhat.repo.patch"
+    name: "0001-subscription-manager-rocky-remove-redhat-refs.patch"
     type: Patch
     add: true
     add_to_prep: true
@@ -48,14 +48,16 @@ spec_change {
   search_and_replace {
     any: true
     find: "install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem"
-    replace: "rm %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem"
+    #replace: "rm %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem"
+    replace: "# remove redhat entitlement"
     n: 1
   }
 
   search_and_replace {
     any: true
     find: "install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-uep.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-uep.pem"
-    replace: "sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscription-manager.conf"
+    #replace: "rm %{_builddir}/%{buildsubdir}/etc-conf/redhat-uep.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-uep.pem"
+    replace: "# remove redhat uep"
     n: 1
   }
 
@@ -86,4 +88,18 @@ spec_change {
     replace: "# remove redhat entitlement authority"
     n: 1
   }
+
+  # Remove random red hat references
+  search_and_replace {
+    any: true
+    find: "the Red Hat"
+    replace: "an"
+    n: -1
+  }
+  search_and_replace {
+    any: true
+    find: "a Red Hat"
+    replace: "a"
+    n: -1
+  }
 }

ROCKY/_supporting/subscription-manager-rocky-remove-redhat.repo.patch → ROCKY/_supporting/0001-subscription-manager-rocky-remove-redhat-refs.patch

+diff -Naurp subscription-manager-1.29.21-orig/etc-conf/plugin/subscription-manager.conf subscription-manager-1.29.21/etc-conf/plugin/subscription-manager.conf
+--- subscription-manager-1.29.21-orig/etc-conf/plugin/subscription-manager.conf	2021-11-11 13:38:40.000000000 -0700
++++ subscription-manager-1.29.21/etc-conf/plugin/subscription-manager.conf	2022-01-26 23:48:52.979563096 -0700
+@@ -1,5 +1,5 @@
+ [main]
+-enabled=1
++enabled=0
+ 
+ # When following option is set to 1, then all repositories defined outside redhat.repo will be disabled
+ # every time subscription-manager plugin is triggered by dnf or yum
 diff -Naurp subscription-manager-1.29.21-orig/etc-conf/subscription-manager-cockpit.desktop.in subscription-manager-1.29.21/etc-conf/subscription-manager-cockpit.desktop.in
 --- subscription-manager-1.29.21-orig/etc-conf/subscription-manager-cockpit.desktop.in	2021-11-11 13:38:40.000000000 -0700
 +++ subscription-manager-1.29.21/etc-conf/subscription-manager-cockpit.desktop.in	2022-01-26 23:11:04.865611666 -0700