From eb25ecb18c6f2fc30b3d7c7a5075b8b7b8cbae0f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Feb 28 2023 18:15:04 +0000
Subject: import rhel-system-roles-1.21.0-2.el8


---

diff --git a/.gitignore b/.gitignore
index a9d921e..dbecbd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@ SOURCES/nbde_server-1.3.3.tar.gz
 SOURCES/network-1.11.2.tar.gz
 SOURCES/podman-1.1.2.tar.gz
 SOURCES/postfix-1.3.3.tar.gz
-SOURCES/rhc-1.1.0.tar.gz
 SOURCES/selinux-1.5.6.tar.gz
 SOURCES/ssh-1.1.12.tar.gz
 SOURCES/storage-1.9.6.tar.gz
diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata
index d19da52..95d9177 100644
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@@ -19,7 +19,6 @@ cf27267d3d54f1537ddda89f6d4db7abbe55b357 SOURCES/nbde_client-1.2.10.tar.gz
 857b1c3ea5a1a48dc964fb5c139861ba01c9e732 SOURCES/network-1.11.2.tar.gz
 fe48a68775bcb87daf3f62ab58a1998ffaa4e6be SOURCES/podman-1.1.2.tar.gz
 9244301089661fecca31dfee431b32d4876063be SOURCES/postfix-1.3.3.tar.gz
-f710c55d3b70b2c278f55d234bab214c803e4504 SOURCES/rhc-1.1.0.tar.gz
 bac983e0dcc5041a4c7d4d25849ed31aaf462df7 SOURCES/selinux-1.5.6.tar.gz
 1bb35bc413249ce3209e471687afd60e0e25dddb SOURCES/ssh-1.1.12.tar.gz
 0eea1b45136cb807740fa12435b02eccdb35a7ac SOURCES/storage-1.9.6.tar.gz
diff --git a/SOURCES/CHANGELOG.md b/SOURCES/CHANGELOG.md
index fd838b0..b05beb7 100644
--- a/SOURCES/CHANGELOG.md
+++ b/SOURCES/CHANGELOG.md
@@ -20,7 +20,6 @@ Changelog
 - [network - Support looking up named route table in routing rule](https://bugzilla.redhat.com/show_bug.cgi?id=2129620)
 - [podman - [RFE] role for managing podman containers and systemd](https://bugzilla.redhat.com/show_bug.cgi?id=2066864)
 - [postfix - [RFE] convert postfix role to use firewall and selinux role](https://bugzilla.redhat.com/show_bug.cgi?id=2130332)
-- [rhc - New role for subscription management/registration/insights](https://bugzilla.redhat.com/show_bug.cgi?id=2144877)
 - [selinux - add support for the 'local' parameter](https://bugzilla.redhat.com/show_bug.cgi?id=2143385)
 - [vpn - Add parameters shared_key_content, ike, esp, type, leftid, rightid](https://bugzilla.redhat.com/show_bug.cgi?id=2119600)
 - [vpn - [RFE] convert vpn role to use firewall and selinux role](https://bugzilla.redhat.com/show_bug.cgi?id=2130345)
diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec
index 2029f76..53bae92 100644
--- a/SPECS/rhel-system-roles.spec
+++ b/SPECS/rhel-system-roles.spec
@@ -30,7 +30,7 @@ Name: linux-system-roles
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
 Version: 1.21.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3+ and MIT and BSD and Python
 %global _pkglicensedir %{_licensedir}/%{name}
@@ -179,8 +179,8 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %global rolename22 ad_integration
 %deftag 22 1.0.2
 
-%global rolename23 rhc
-%deftag 23 1.1.0
+#%%global rolename23 rhc
+#%%deftag 23 1.1.0
 
 %global rolename24 journald
 %deftag 24 1.0.0
@@ -207,7 +207,7 @@ Source19: %{archiveurl19}
 Source20: %{archiveurl20}
 Source21: %{archiveurl21}
 Source22: %{archiveurl22}
-Source23: %{archiveurl23}
+#Source23: %{archiveurl23}
 Source24: %{archiveurl24}
 # END AUTOGENERATED SOURCES
 
@@ -275,7 +275,8 @@ end
 
 %prep
 # BEGIN AUTOGENERATED SETUP
-%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -n %{getarchivedir 0}
+#%%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -n %{getarchivedir 0}
+%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a24 -n %{getarchivedir 0}
 # END AUTOGENERATED SETUP
 
 %if 0%{?rhel}
@@ -372,8 +373,8 @@ done
 #     - Module seport, sefcontext and selogin for the selinux role rolename2
 #     - Module ini_file for role tlog
 #     - rhc modules
-module_map=( ["seport.py"]="selinux" ["sefcontext.py"]="selinux" ["selogin.py"]="selinux" ["ini_file.py"]="tlog"
-  ["redhat_subscription.py"]="rhc" ["rhsm_release.py"]="rhc" ["rhsm_repository.py"]="rhc" )
+#  ["redhat_subscription.py"]="rhc" ["rhsm_release.py"]="rhc" ["rhsm_repository.py"]="rhc" )
+module_map=( ["seport.py"]="selinux" ["sefcontext.py"]="selinux" ["selogin.py"]="selinux" ["ini_file.py"]="tlog" )
 for module in "${!module_map[@]}"; do
   role="${module_map[${module}]}"
   if [ ! -d $role/library ]; then
@@ -748,6 +749,10 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif
 
 %changelog
+* Wed Feb 22 2023 Rich Megginson <rmeggins@redhat.com> - 1.21.0-2
+- Resolves:rhbz#2144877 : rhc - new role for subscription management/registration/insights
+- remove role until https://bugzilla.redhat.com/show_bug.cgi?id=2171829 is fixed
+
 * Mon Feb 20 2023 Rich Megginson <rmeggins@redhat.com> - 1.21.0-1
 - Resolves:rhbz#2168733 : network - RedHat Role rhel-system-roles.network should route traffic via correct bond