5 changed files with 59 additions and 177 deletions
--- a/config.yaml
+++ b/config.yaml
@ -1,108 +1,17 @@
 actions:
  - replace:
      - target: "spec"
-        find: "%global use_initial_setup 1"
-        replace: "%global use_initial_setup 0"
+        find: "the Red Hat entitlement"
+        replace: "an entitlement"
+        count: 2
+      - target: "spec"
+        find: "This package provides a plugin to interact with repositories from the Red Hat"
+        replace: "This package provides a plugin to interact with repositories from an"
        count: 1
      - target: "spec"
-        find: "%global use_rhsm_gtk 1"
-        replace: "%global use_rhsm_gtk 0"
-        count: 1
-      - target: "spec"
-        find: "%global use_cockpit 0%{?fedora} || 0%{?rhel} >= 7"
-        replace: "%global use_cockpit 0"
-        count: 1
-      - target: "spec"
-        find: |
-              %if !%{use_container_plugin}
-              Obsoletes: subscription-manager-plugin-container
-              %endif
-        replace: |
-              %if !%{use_container_plugin}
-              Obsoletes: subscription-manager-plugin-container
-              %endif
-              # AlmaLinux do not provide the following packages no more
-              Obsoletes: subscription-manager-cockpit
-              Obsoletes: subscription-manager-initial-setup-addon
-              Obsoletes: rhsm-gtk
-              Obsoletes: rhsm-icons
-        count: 1
-      - target: "spec"
-        find: "a Red Hat"
-        replace: "a"
-      - target: "spec"
-        find: "the Red Hat"
-        replace: "the"
-      - target: "spec"
-        find: "Red Hat product subscriptions"
-        replace: "product subscriptions"
-      - target: "spec"
-        find: "Red Hat Subscription"
-        replace: "Subscription"
-      - target: "spec"
-        find: "Red Hat subscriptions"
-        replace: "subscriptions"
-      - target: "spec"
-        find: |
-              %if (0%{?rhel} >= 8)
-              Supplements: initial-setup-gui
-              %endif
-        replace: |
-              %if %{undefined almalinux_ver}
-              %if (0%{?rhel} >= 8)
-              Supplements: initial-setup-gui
-              %endif
-              %endif
-        count: 1
-      - target: "spec"
-        find: |
-              %if %{use_yum} || %{use_dnf}
-                  mkdir %{buildroot}%{_sysconfdir}/yum.repos.d
-                  touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo
-              %endif
-        replace: |
-              %if %{use_yum} || %{use_dnf}
-                  mkdir %{buildroot}%{_sysconfdir}/yum.repos.d
-                  %if %{undefined almalinux_ver}
-                  touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo
-                  %endif
-              %endif
-        count: 1
-      - target: "spec"
-        find: |
-              mkdir %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com
-              install -m 644 %{_builddir}/%{buildsubdir}/src/content_plugins/redhat-entitlement-authority.pem %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt
-              %endif
-        replace: |
-              %if %{undefined almalinux_ver}
-              mkdir %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com
-              install -m 644 %{_builddir}/%{buildsubdir}/src/content_plugins/redhat-entitlement-authority.pem %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt
-              %endif
-              %endif
-        count: 1
-      - target: "spec"
-        find: "# base/cli tools use the gettext domain 'rhsm', while the"
-        replace: |
-              %if %{defined almalinux_ver}
-              sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscription-manager.conf
-              %endif
-              
-              # base/cli tools use the gettext domain 'rhsm', while the
-        count: 1
-      - target: "spec"
-        find: |
-              # Copying Red Hat CA cert into each directory:
-              %attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com
-              %attr(644,root,root) %{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt
-              %endif
-        replace: |
-              %if %{undefined almalinux_ver}
-              # Copying Red Hat CA cert into each directory:
-              %attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com
-              %attr(644,root,root) %{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt
-              %endif
-              %endif
-        count: 1
+        find: "a Red Hat Unified"
+        replace: "a Unified"
+        count: 2

  - modify_release:
    - suffix: ".alma.1"
@ -112,15 +21,9 @@ actions:
      - name: "Eduard Abdullin"
        email: "eabdullin@almalinux.org"
        line:
-          - "AlmaLinux changes"
+          - "Debrand for AlmaLinux"

  - add_files:
      - type: "patch"
-        name: "use-almalinux-syspurposes.patch"
-        number: 100
-      - type: "patch"
-        name: "subscription-manager-remove-redhat.repo.patch"
-        number: 101
-      - type: "patch"
-        name: "subscription-manager-debrand.patch"
-        number: 102
+        name: "almalinux_debrand.patch"
+        number: 1000
--- a/files/almalinux_debrand.patch
+++ b/files/almalinux_debrand.patch
@ -0,0 +1,47 @@
+diff -aruN subscription-manager-1.29.37/etc-conf/syspurpose/valid_fields.json subscription-manager-1.29.37.alma/etc-conf/syspurpose/valid_fields.json
+--- subscription-manager-1.29.37/etc-conf/syspurpose/valid_fields.json	2023-08-23 07:18:22
+++ subscription-manager-1.29.37.alma/etc-conf/syspurpose/valid_fields.json	2023-10-09 23:38:40
+@@ -1,12 +1,10 @@
+ {
+     "role": [
+-      "Red Hat Enterprise Linux Server",
+-      "Red Hat Enterprise Linux Workstation",
+-      "Red Hat Enterprise Linux Compute Node"
+      "AlmaLinux Server",
+      "AlmaLinux Workstation",
+      "AlmaLinux Compute Node"
+     ],
+     "service_level_agreement": [
+-      "Premium",
+-      "Standard",
+       "Self-Support"
+     ],
+     "usage": [
+diff -aruN subscription-manager-1.29.37/src/subscription_manager/repofile.py subscription-manager-1.29.37.alma/src/subscription_manager/repofile.py
+--- subscription-manager-1.29.37/src/subscription_manager/repofile.py	2023-08-23 07:18:22
+++ subscription-manager-1.29.37.alma/src/subscription_manager/repofile.py	2023-10-09 23:38:48
+@@ -375,11 +375,7 @@
+         """
+         Try to create new repo file.
+         """
+-        self.create_dir_path()
+-        if self.path_exists(self.path) or not self.manage_repos:
+-            return
+-        with open(self.path, "w") as f:
+-            f.write(self.REPOFILE_HEADER)
+        pass
+ 
+     def fix_content(self, content: str) -> str:
+         return content
+diff -aruN subscription-manager-1.29.37/src/subscription_manager/repolib.py subscription-manager-1.29.37.alma/src/subscription_manager/repolib.py
+--- subscription-manager-1.29.37/src/subscription_manager/repolib.py	2023-08-23 07:18:22
+++ subscription-manager-1.29.37.alma/src/subscription_manager/repolib.py	2023-10-09 23:38:57
+@@ -92,7 +92,7 @@
+     def warning_message(enabled_yum_plugins: List[str]) -> str:
+         message = _(
+             "The yum/dnf plugins: %s were automatically enabled for the benefit of "
+-            "Red Hat Subscription Management. If not desired, use "
+            "Subscription Management. If not desired, use "
+             '"subscription-manager config --rhsm.auto_enable_yum_plugins=0" to '
+             "block this behavior."
+         ) % ", ".join(enabled_yum_plugins)
--- a/files/subscription-manager-debrand.patch
+++ b/files/subscription-manager-debrand.patch
@ -1,32 +0,0 @@
-diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.desktop.in subscription-manager-1.28.29.alma/etc-conf/subscription-manager-cockpit.desktop.in
--- subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.desktop.in	2022-04-13 18:01:03.000000000 +0300
-+++ subscription-manager-1.28.29.alma/etc-conf/subscription-manager-cockpit.desktop.in	2022-05-10 19:54:57.000000000 +0300
-@@ -1,5 +1,5 @@
- [Desktop Entry]
-_Name=Red Hat Subscription Manager
-+_Name=Subscription Manager
- Icon=subscription-manager
- Type=Application
- TryExec=/usr/libexec/cockpit-desktop
-diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-gui.desktop.in subscription-manager-1.28.29.alma/etc-conf/subscription-manager-gui.desktop.in
--- subscription-manager-1.28.29/etc-conf/subscription-manager-gui.desktop.in	2022-04-13 18:01:03.000000000 +0300
-+++ subscription-manager-1.28.29.alma/etc-conf/subscription-manager-gui.desktop.in	2022-05-10 19:55:18.000000000 +0300
-@@ -1,5 +1,5 @@
- [Desktop Entry]
-_Name=Red Hat Subscription Manager
-+_Name=Subscription Manager
- Icon=subscription-manager
- Exec=subscription-manager-gui
- Terminal=false
-diff -aruN subscription-manager-1.28.29/src/subscription_manager/repolib.py subscription-manager-1.28.29.alma/src/subscription_manager/repolib.py
--- subscription-manager-1.28.29/src/subscription_manager/repolib.py	2022-04-13 18:01:03.000000000 +0300
-+++ subscription-manager-1.28.29.alma/src/subscription_manager/repolib.py	2022-05-10 20:01:44.000000000 +0300
-@@ -87,7 +87,7 @@
-     @staticmethod
-     def warning_message(enabled_yum_plugins):
-         message = _('The yum/dnf plugins: %s were automatically enabled for the benefit of '
-                    'Red Hat Subscription Management. If not desired, use '
-+                    'Subscription Management. If not desired, use '
-                     '"subscription-manager config --rhsm.auto_enable_yum_plugins=0" to '
-                     'block this behavior.') % ', '.join(enabled_yum_plugins)
-         return message
--- a/files/subscription-manager-remove-redhat.repo.patch
+++ b/files/subscription-manager-remove-redhat.repo.patch
@ -1,16 +0,0 @@
-diff -Nurp subscription-manager-1.27.11.orig/src/subscription_manager/repofile.py subscription-manager-1.27.11/src/subscription_manager/repofile.py
--- subscription-manager-1.27.11.orig/src/subscription_manager/repofile.py	2020-07-28 11:06:10.000000000 -0500
-+++ subscription-manager-1.27.11/src/subscription_manager/repofile.py	2020-08-05 16:48:00.911709258 -0500
-@@ -368,11 +368,7 @@ class RepoFileBase(object):
-         Try to create new repo file.
-         :return: None
-         """
-        self.create_dir_path()
-        if self.path_exists(self.path) or not self.manage_repos:
-            return
-        with open(self.path, 'w') as f:
-            f.write(self.REPOFILE_HEADER)
-+        pass
- 
-     def fix_content(self, content):
-         return content
--- a/files/use-almalinux-syspurposes.patch
+++ b/files/use-almalinux-syspurposes.patch
@ -1,20 +0,0 @@
-diff --git a/etc-conf/syspurpose/valid_fields.json b/etc-conf/syspurpose/valid_fields.json
-index 1ac7ea0e..305ec4b9 100644
--- a/etc-conf/syspurpose/valid_fields.json
-+++ b/etc-conf/syspurpose/valid_fields.json
-@@ -1,12 +1,10 @@
- {
-     "role": [
-      "Red Hat Enterprise Linux Server",
-      "Red Hat Enterprise Linux Workstation",
-      "Red Hat Enterprise Linux Compute Node"
-+      "AlmaLinux Server",
-+      "AlmaLinux Workstation",
-+      "AlmaLinux Compute Node"
-     ],
-     "service_level_agreement": [
-      "Premium",
-      "Standard",
-       "Self-Support"
-     ],
-     "usage": [