From 425f50c0d7894cdab5199ab9a296d448d985e917 Mon Sep 17 00:00:00 2001
From: nazunalika <label@rockylinux.org>
Date: Wed, 22 Jun 2022 08:05:29 -0700
Subject: [PATCH] add back release eula to make syncing easier

---
 comps-rocky-9-lh.xml    | 4 ++++
 comps-rocky-9-lh.xml.in | 4 ++++
 conv-to-stable.sh       | 7 +++++++
 3 files changed, 15 insertions(+)
 create mode 100755 conv-to-stable.sh

diff --git a/comps-rocky-9-lh.xml b/comps-rocky-9-lh.xml
index 3e3a034..79be7d2 100644
--- a/comps-rocky-9-lh.xml
+++ b/comps-rocky-9-lh.xml
@@ -1024,6 +1024,7 @@
     <packagelist>
       <packagereq variant="BaseOS" type="mandatory">chrony</packagereq>
       <packagereq variant="BaseOS" type="mandatory">rocky-release</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">rocky-release-eula</packagereq>
       <packagereq variant="BaseOS" type="mandatory">polkit</packagereq>
       <packagereq variant="BaseOS" type="mandatory">realmd</packagereq>
       <packagereq variant="BaseOS" type="default">NetworkManager-config-server</packagereq>
@@ -1072,6 +1073,7 @@
       <packagereq variant="BaseOS" type="mandatory">psacct</packagereq>
       <packagereq variant="BaseOS" type="mandatory">quota</packagereq>
       <packagereq variant="BaseOS" type="mandatory">rocky-release</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">rocky-release-eula</packagereq>
       <packagereq variant="BaseOS" type="mandatory">sudo</packagereq>
       <packagereq variant="BaseOS" type="mandatory">symlinks</packagereq>
       <packagereq variant="BaseOS" type="mandatory">systemd-udev</packagereq>
@@ -1178,6 +1180,7 @@
       <packagereq variant="BaseOS" type="mandatory">psacct</packagereq>
       <packagereq variant="BaseOS" type="mandatory">quota</packagereq>
       <packagereq variant="BaseOS" type="mandatory">rocky-release</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">rocky-release-eula</packagereq>
       <packagereq variant="BaseOS" type="mandatory">sudo</packagereq>
       <packagereq variant="BaseOS" type="mandatory">symlinks</packagereq>
       <packagereq variant="BaseOS" type="mandatory">systemd-udev</packagereq>
@@ -1691,6 +1694,7 @@
       <packagereq variant="BaseOS">quota</packagereq>
       <packagereq variant="BaseOS">realmd</packagereq>
       <packagereq variant="BaseOS" type="mandatory">rocky-release</packagereq>
+      <packagereq variant="BaseOS" type="mandatory">rocky-release-eula</packagereq>
       <packagereq variant="BaseOS">rsync</packagereq>
       <packagereq variant="BaseOS">sos</packagereq>
       <packagereq variant="BaseOS">sssd</packagereq>
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index 8b3fa6f..d250551 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -1023,6 +1023,7 @@
     <packagelist>
       <packagereq type="mandatory" variant="BaseOS">chrony</packagereq>
       <packagereq type="mandatory" variant="BaseOS">rocky-release</packagereq>
+      <packagereq type="mandatory" variant="BaseOS">rocky-release-eula</packagereq>
       <packagereq type="mandatory" variant="BaseOS">polkit</packagereq>
       <packagereq type="mandatory" variant="BaseOS">realmd</packagereq>
       <packagereq type="default" variant="BaseOS">NetworkManager-config-server</packagereq>
@@ -1071,6 +1072,7 @@
       <packagereq type="mandatory" variant="BaseOS">psacct</packagereq>
       <packagereq type="mandatory" variant="BaseOS">quota</packagereq>
       <packagereq type="mandatory" variant="BaseOS">rocky-release</packagereq>
+      <packagereq type="mandatory" variant="BaseOS">rocky-release-eula</packagereq>
       <packagereq type="mandatory" variant="BaseOS">sudo</packagereq>
       <packagereq type="mandatory" variant="BaseOS">symlinks</packagereq>
       <packagereq type="mandatory" variant="BaseOS">systemd-udev</packagereq>
@@ -1177,6 +1179,7 @@
       <packagereq type="mandatory" variant="BaseOS">psacct</packagereq>
       <packagereq type="mandatory" variant="BaseOS">quota</packagereq>
       <packagereq type="mandatory" variant="BaseOS">rocky-release</packagereq>
+      <packagereq type="mandatory" variant="BaseOS">rocky-release-eula</packagereq>
       <packagereq type="mandatory" variant="BaseOS">sudo</packagereq>
       <packagereq type="mandatory" variant="BaseOS">symlinks</packagereq>
       <packagereq type="mandatory" variant="BaseOS">systemd-udev</packagereq>
@@ -1690,6 +1693,7 @@
       <packagereq variant="BaseOS">quota</packagereq>
       <packagereq variant="BaseOS">realmd</packagereq>
       <packagereq type="mandatory" variant="BaseOS">rocky-release</packagereq>
+      <packagereq type="mandatory" variant="BaseOS">rocky-release-eula</packagereq>
       <packagereq variant="BaseOS">rsync</packagereq>
       <packagereq variant="BaseOS">sos</packagereq>
       <packagereq variant="BaseOS">sssd</packagereq>
diff --git a/conv-to-stable.sh b/conv-to-stable.sh
new file mode 100755
index 0000000..20fd4b2
--- /dev/null
+++ b/conv-to-stable.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+x=$1
+y=$2
+
+cp comps-rocky-${x}-lh.xml.in comps-rocky-${x}.${y}.xml.in
+sed -i '/rocky-release-eula/d' comps-rocky-${x}.${y}.xml.in