From 7c4470453a2045580ea49c722d24809d98ccd067 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Thu, 6 Oct 2022 11:06:35 -0700
Subject: [PATCH 1/3] add npth-devel to devel

---
 common/include-excludes.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/include-excludes.conf b/common/include-excludes.conf
index 9b41fb2..5c26cad 100644
--- a/common/include-excludes.conf
+++ b/common/include-excludes.conf
@@ -905,6 +905,7 @@ additional_packages = [
             "mpich-autoload",
             "msghack",
             "ncurses-static",
+            "npth-devel",
             "ocaml-xml-light-devel",
             "ongres-scram-javadoc",
             "ongres-scram-parent",

From 8bba1935dc26da93818deb88875f1f8681c728bc Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Thu, 6 Oct 2022 11:08:01 -0700
Subject: [PATCH 2/3] permanently remove insights and rhc

---
 rocky-packages.json | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/rocky-packages.json b/rocky-packages.json
index 3d324c8..feceb34 100644
--- a/rocky-packages.json
+++ b/rocky-packages.json
@@ -2338,9 +2338,6 @@
         "initial-setup-gui.aarch64",
         "initial-setup.aarch64"
       ],
-      "insights-client": [
-        "insights-client.noarch"
-      ],
       "intltool": [
         "intltool.noarch"
       ],
@@ -5006,12 +5003,6 @@
       "rest": [
         "rest.aarch64"
       ],
-      "rhc": [
-        "rhc.aarch64"
-      ],
-      "rhc-worker-playbook": [
-        "rhc-worker-playbook.aarch64"
-      ],
       "rhel-system-roles": [
         "rhel-system-roles.noarch"
       ],
@@ -8549,9 +8540,6 @@
         "initial-setup-gui.ppc64le",
         "initial-setup.ppc64le"
       ],
-      "insights-client": [
-        "insights-client.noarch"
-      ],
       "intltool": [
         "intltool.noarch"
       ],
@@ -11435,12 +11423,6 @@
       "rest": [
         "rest.ppc64le"
       ],
-      "rhc": [
-        "rhc.ppc64le"
-      ],
-      "rhc-worker-playbook": [
-        "rhc-worker-playbook.ppc64le"
-      ],
       "rhel-system-roles": [
         "rhel-system-roles.noarch"
       ],
@@ -15377,9 +15359,6 @@
         "initial-setup-gui.x86_64",
         "initial-setup.x86_64"
       ],
-      "insights-client": [
-        "insights-client.noarch"
-      ],
       "intltool": [
         "intltool.noarch"
       ],
@@ -18927,12 +18906,6 @@
         "rest.i686",
         "rest.x86_64"
       ],
-      "rhc": [
-        "rhc.x86_64"
-      ],
-      "rhc-worker-playbook": [
-        "rhc-worker-playbook.x86_64"
-      ],
       "rhel-system-roles": [
         "rhel-system-roles.noarch"
       ],

From 150d13d3d1a34d88162bc4d917b1cd597cfc501f Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Mon, 17 Oct 2022 10:26:57 -0700
Subject: [PATCH 3/3] add devel modules to devel variants

---
 variants-devel.xml | 86 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/variants-devel.xml b/variants-devel.xml
index 424627c..efd2c67 100644
--- a/variants-devel.xml
+++ b/variants-devel.xml
@@ -8,5 +8,91 @@
       <arch>x86_64</arch>
       <arch>ppc64le</arch>
     </arches>
+    <modules>
+      <module>389-ds-devel:1.4</module>
+      <module>ant-devel:1.10</module>
+      <module>container-tools-devel:1.0</module>
+      <module>container-tools-devel:2.0</module>
+      <module>container-tools-devel:3.0</module>
+      <module>container-tools-devel:4.0</module>
+      <module>container-tools-devel:rhel8</module>
+      <module>eclipse-devel:rhel8</module>
+      <module>freeradius-devel:3.0</module>
+      <module>gimp-devel:2.8</module>
+      <module>go-toolset-devel:rhel8</module>
+      <module>httpd-devel:2.4</module>
+      <module>idm-devel:DL1</module>
+      <module>idm-devel:client</module>
+      <module>inkscape-devel:0.92.3</module>
+      <module>javapackages-runtime-devel:201801</module>
+      <module>jmc-devel:rhel8</module>
+      <module>libselinux-python-devel:2.8</module>
+      <module>llvm-toolset-devel:rhel8</module>
+      <module>log4j-devel:2</module>
+      <module>mailman-devel:2.1</module>
+      <module>mariadb-devel:10.5</module>
+      <module>maven-devel:3.5</module>
+      <module>maven-devel:3.6</module>
+      <module>maven-devel:3.8</module>
+      <module>mercurial-devel:4.8</module>
+      <module>mercurial-devel:6.2</module>
+      <module>mod_auth_openidc-devel:2.3</module>
+      <module>mongodb:3.6</module>
+      <module>mongodb-devel:3.6</module>
+      <module>mysql-devel:8.0</module>
+      <module>nginx-devel:1.14</module>
+      <module>nginx-devel:1.16</module>
+      <module>nginx-devel:1.18</module>
+      <module>nginx-devel:1.20</module>
+      <module>nodejs-devel:10</module>
+      <module>nodejs-devel:12</module>
+      <module>nodejs-devel:14</module>
+      <module>nodejs-devel:16</module>
+      <module>nodejs-devel:18</module>
+      <module>parfait-devel:0.5</module>
+      <module>perl-App-cpanminus-devel:1.7044</module>
+      <module>perl-DBD-MySQL-devel:4.046</module>
+      <module>perl-DBD-Pg-devel:3.7</module>
+      <module>perl-DBD-SQLite-devel:1.58</module>
+      <module>perl-DBI-devel:1.641</module>
+      <module>perl-FCGI-devel:0.78</module>
+      <module>perl-IO-Socket-SSL-devel:2.066</module>
+      <module>perl-YAML-devel:1.24</module>
+      <module>perl-libwww-perl-devel:6.34</module>
+      <module>perl-devel:5.24</module>
+      <module>perl-devel:5.26</module>
+      <module>perl-devel:5.30</module>
+      <module>perl-devel:5.32</module>
+      <module>php-devel:7.2</module>
+      <module>php-devel:7.3</module>
+      <module>php-devel:7.4</module>
+      <module>php-devel:8.0</module>
+      <module>pki-core-devel:10.6</module>
+      <module>pki-deps-devel:10.6</module>
+      <module>pmdk-devel:1-fileformat-v6</module>
+      <module>postgresql-devel:10</module>
+      <module>postgresql-devel:12</module>
+      <module>postgresql-devel:13</module>
+      <module>postgresql-devel:9.6</module>
+      <module>python27-devel:2.7</module>
+      <module>python36-devel:3.6</module>
+      <module>redis-devel:5</module>
+      <module>redis-devel:6</module>
+      <module>rhn-tools-devel:1.0</module>
+      <module>ruby-devel:2.5</module>
+      <module>ruby-devel:2.6</module>
+      <module>ruby-devel:2.7</module>
+      <module>ruby-devel:3.0</module>
+      <module>ruby-devel:3.1</module>
+      <module>rust-toolset-devel:rhel8</module>
+      <module>satellite-5-client-devel:1.0</module>
+      <module>scala-devel:2.10</module>
+      <module>squid-devel:4</module>
+      <module>subversion-devel:1.10</module>
+      <module>subversion-devel:1.14</module>
+      <module>swig-devel:3.0</module>
+      <module>swig-devel:4.0</module>
+      <module>varnish-devel:6</module>
+    </modules>
   </variant>
 </variants>