Compare commits

...

No commits in common. 'c9' and 'i9' have entirely different histories.
c9 ... i9

@ -0,0 +1,456 @@
From 2572c02cde4a2873f9018f7b53a8a743adca04c0 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Sun, 2 Apr 2023 19:02:09 +0300
Subject: [PATCH 1/3] Debrand for MSVSphere
---
po/as.po | 4 ++--
po/bn_IN.po | 4 ++--
po/de.po | 6 +++---
po/es.po | 8 ++++----
po/fr.po | 8 ++++----
po/gu.po | 4 ++--
po/hi.po | 4 ++--
po/it.po | 6 +++---
po/ja.po | 6 +++---
po/ka.po | 4 ++--
po/keys.pot | 4 ++--
po/kn.po | 4 ++--
po/ko.po | 6 +++---
po/ml.po | 4 ++--
po/mr.po | 4 ++--
po/or.po | 4 ++--
po/pa.po | 4 ++--
po/pt_BR.po | 6 +++---
po/ru.po | 6 +++---
po/si.po | 4 ++--
po/ta_IN.po | 4 ++--
po/te.po | 4 ++--
po/zh_CN.po | 6 +++---
po/zh_TW.po | 6 +++---
src/subscription_manager/repolib.py | 2 +-
25 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/po/as.po b/po/as.po
index 0de316b..e44098c 100644
--- a/po/as.po
+++ b/po/as.po
@@ -4306,8 +4306,8 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 1db79ec..2303d20 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -4363,8 +4363,8 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
diff --git a/po/de.po b/po/de.po
index 9512356..4fc1839 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4065,11 +4065,11 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
-"Die yum/dnf-Plugins: %s wurden automatisch zum Nutzen von Red Hat "
+"Die yum/dnf-Plugins: %s wurden automatisch zum Nutzen von "
"Subscription Management aktiviert. Wenn nicht gewünscht, verwenden Sie "
"\"subscription-manager config --rhsm.auto_enable_yum_plugins=0\", um dies zu "
"blockieren."
diff --git a/po/es.po b/po/es.po
index c12a01e..af98be2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4061,12 +4061,12 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
-"Los plugins yum/dnf: %s se habilitaron automáticamente en beneficio de Red "
-"Hat Subscription Management. Si no lo desea, use \"subscription-manager "
+"Los plugins yum/dnf: %s se habilitaron automáticamente en beneficio de "
+"Subscription Management. Si no lo desea, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" para bloquear este comportamiento."
#: src/subscription_manager/repolib.py:670
diff --git a/po/fr.po b/po/fr.po
index 9737912..f47fa50 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3947,12 +3947,12 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
-"Les greffons yum : %s ont été activées automatiquement au bénéfice de Red "
-"Hat Subscription Management. Si vous ne le souhaitez pas, utiliser "
+"Les greffons yum : %s ont été activées automatiquement au bénéfice de "
+"Subscription Management. Si vous ne le souhaitez pas, utiliser "
 subscription-manager config --rhsm.auto_enable_yum_plugins=0 » pour "
"bloquer ce comportement."
diff --git a/po/gu.po b/po/gu.po
index d9a73a2..7942da3 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -4298,8 +4298,8 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 39b4c7a..fe24e54 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -4316,8 +4316,8 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
diff --git a/po/it.po b/po/it.po
index 6c97a42..c71df6a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3995,12 +3995,12 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
"I plugin yum / dnf: %s sono stati abilitati automaticamente a vantaggio di "
-"Red Hat Subscription Management. Se non lo si desidera, utilizzare "
+"Subscription Management. Se non lo si desidera, utilizzare "
"\"subscription-manager config --rhsm.auto_enable_yum_plugins=0\" per "
"bloccare questo comportamento."
diff --git a/po/ja.po b/po/ja.po
index 6dd5482..6cfe667 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3841,11 +3841,11 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
-"yum/dnf プラグイン: Red Hat サブスクリプション管理に対して %s が自動的に有効"
+"yum/dnf プラグイン: サブスクリプション管理に対して %s が自動的に有効"
"になりました。自動的に有効化しない場合は、\"subscription-manager config --"
"rhsm.auto_enable_yum_plugins=0\" で無効にします。"
diff --git a/po/ka.po b/po/ka.po
index 7276d25..4eb9511 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -3252,8 +3252,8 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
diff --git a/po/keys.pot b/po/keys.pot
index b2f60b6..97a6d09 100644
--- a/po/keys.pot
+++ b/po/keys.pot
@@ -3195,8 +3195,8 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 70e13b0..2fe73e6 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -4463,8 +4463,8 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 8b1db39..1aabdde 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3790,11 +3790,11 @@ msgstr "오류: 출시 제품 인증서가 두 개 이상 설치되어 있습니
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
-"yum 플러그인: %s이 Red Hat 서브스크립션 관리를 통해 자동으로 활성화되었습니"
+"yum 플러그인: %s이 서브스크립션 관리를 통해 자동으로 활성화되었습니"
"다. 원하지 않을 경우 \"subscription-manager config --rhsm."
"auto_enable_yum_plugins=0\"을 사용하여 이 동작을 차단하십시오."
diff --git a/po/ml.po b/po/ml.po
index 65c8cc1..bbc6210 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -4415,8 +4415,8 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 94db60f..6a81e59 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -4400,8 +4400,8 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
diff --git a/po/or.po b/po/or.po
index 2a35651..df8cb18 100644
--- a/po/or.po
+++ b/po/or.po
@@ -4404,8 +4404,8 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 42f74ab..83035f9 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -4343,8 +4343,8 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 354bfe1..cdb6379 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4086,12 +4086,12 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
"Os plugins do yum / dnf: %s foram ativados automaticamente para o benefício "
-"do Red Hat Subscription Management. Se não desejar, use \"subscription-"
+"do Subscription Management. Se não desejar, use \"subscription-"
"manager config --rhsm.auto_enable_yum_plugins=0\" para bloquear este "
"comportamento."
diff --git a/po/ru.po b/po/ru.po
index 4982dcc..a9d9c82 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4027,12 +4027,12 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
"Плагины yum / dnf: %s были автоматически включены в интересах управления "
-"подпиской Red Hat. Если это нежелательно, используйте «subscription-manager "
+"подпиской. Если это нежелательно, используйте «subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0» для блокировки этого поведения."
#: src/subscription_manager/repolib.py:670
diff --git a/po/si.po b/po/si.po
index 700e75a..b6bacf0 100644
--- a/po/si.po
+++ b/po/si.po
@@ -3195,8 +3195,8 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
diff --git a/po/ta_IN.po b/po/ta_IN.po
index 2880e59..fd743fd 100644
--- a/po/ta_IN.po
+++ b/po/ta_IN.po
@@ -4457,8 +4457,8 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
diff --git a/po/te.po b/po/te.po
index e8c2c08..018631b 100644
--- a/po/te.po
+++ b/po/te.po
@@ -4371,8 +4371,8 @@ msgstr ""
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3187e98..7e2ce5e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3697,11 +3697,11 @@ msgstr "错误:安装了多个发行产品证书。证书路径:%s"
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
-"yum/dnf plugins: %s 会为 Red Hat Subscription Management 自动启用。如果不需"
+"yum/dnf plugins: %s 会为 Subscription Management 自动启用。如果不需"
"要,使用 \"subscription-manager config --rhsm.auto_enable_yum_plugins=0\" 来"
"禁用它。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 877e5b9..76c1278 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3923,11 +3923,11 @@ msgstr "錯誤:安裝了超過一個發行產品憑證。憑證路徑:%s"
#: src/subscription_manager/repolib.py:85
#, python-format
msgid ""
-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red "
-"Hat Subscription Management. If not desired, use \"subscription-manager "
+"The yum/dnf plugins: %s were automatically enabled for the benefit of "
+"Subscription Management. If not desired, use \"subscription-manager "
"config --rhsm.auto_enable_yum_plugins=0\" to block this behavior."
msgstr ""
-"yum / dnf插件%s自動啟用以獲得Red Hat訂閱管理。 如果不需要,請使"
+"yum / dnf插件%s自動啟用以獲得 訂閱管理。 如果不需要,請使"
"用“subscription-manager config --rhsm.auto_enable_yum_plugins=0”來阻止此行"
"為。"
diff --git a/src/subscription_manager/repolib.py b/src/subscription_manager/repolib.py
index dc649ea..fb1dc0d 100644
--- a/src/subscription_manager/repolib.py
+++ b/src/subscription_manager/repolib.py
@@ -83,7 +83,7 @@ class YumPluginManager(object):
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)
--
2.39.2

@ -0,0 +1,28 @@
From 56b3d1ffa69fe78beeabeb682cd96ef643d39594 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Sun, 2 Apr 2023 19:02:34 +0300
Subject: [PATCH 2/3] Set MSVSphere syspurposes
---
etc-conf/syspurpose/valid_fields.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/etc-conf/syspurpose/valid_fields.json b/etc-conf/syspurpose/valid_fields.json
index 1ac7ea0..0cf3787 100644
--- a/etc-conf/syspurpose/valid_fields.json
+++ b/etc-conf/syspurpose/valid_fields.json
@@ -1,8 +1,8 @@
{
"role": [
- "Red Hat Enterprise Linux Server",
- "Red Hat Enterprise Linux Workstation",
- "Red Hat Enterprise Linux Compute Node"
+ "MSVSphere Server",
+ "MSVSphere Workstation",
+ "MSVSphere Compute Node"
],
"service_level_agreement": [
"Premium",
--
2.39.2

@ -0,0 +1,29 @@
From 986f7bbc6a13609b323cc83c318f93ee0723f398 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Sun, 2 Apr 2023 19:03:40 +0300
Subject: [PATCH 3/3] Disable repo file creation
---
src/subscription_manager/repofile.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/subscription_manager/repofile.py b/src/subscription_manager/repofile.py
index 650d963..8bda5f7 100644
--- a/src/subscription_manager/repofile.py
+++ b/src/subscription_manager/repofile.py
@@ -370,11 +370,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
--
2.39.2

@ -0,0 +1,23 @@
From eb4d34e3264e31cbd3a17626a3abf7705bb52059 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Sun, 2 Apr 2023 19:15:32 +0300
Subject: [PATCH 4/4] Disable subscription manager plugin
---
etc-conf/plugin/subscription-manager.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc-conf/plugin/subscription-manager.conf b/etc-conf/plugin/subscription-manager.conf
index 9050582..2392f67 100644
--- a/etc-conf/plugin/subscription-manager.conf
+++ b/etc-conf/plugin/subscription-manager.conf
@@ -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
--
2.39.2

@ -96,7 +96,7 @@
Name: subscription-manager
Version: 1.29.38
Release: 1%{?dist}
Release: 1%{?dist}.inferit
Summary: Tools and libraries for subscription and repository management
%if 0%{?suse_version}
Group: Productivity/Networking/System
@ -113,6 +113,12 @@ URL: http://www.candlepinproject.org/
# tito build --tag subscription-manager-$VERSION-$RELEASE --tgz
Source0: %{name}-%{version}.tar.gz
# MSVSphere patches
Patch1001: 0001-Debrand-for-MSVSphere.patch
Patch1002: 0002-Set-MSVSphere-syspurposes.patch
Patch1003: 0003-Disable-repo-file-creation.patch
Patch1004: 0004-Disable-subscription-manager-plugin.patch
# Especially for the OpenSuse Build Service we need to have another lint config
%if 0%{?suse_version}
Source2: subscription-manager-rpmlintrc
@ -211,6 +217,12 @@ Obsoletes: rhsm-gtk <= %{version}-%{release}
Obsoletes: subscription-manager-plugin-container <= %{version}
%endif
# MSVSphere doesn't provide those packages
Obsoletes: subscription-manager-cockpit
Obsoletes: subscription-manager-initial-setup-addon
Obsoletes: rhsm-gtk
Obsoletes: rhsm-icons
%if %{use_dnf}
%if %{create_libdnf_rpm}
# The libdnf plugin is in separate RPM, but shubscription-manager should be dependent
@ -226,7 +238,7 @@ Obsoletes: %{py_package_prefix}-syspurpose <= %{version}
%description
The Subscription Manager package provides programs and libraries to allow users
to manage subscriptions and yum repositories from the Red Hat entitlement
to manage subscriptions and yum repositories from the EL entitlement
platform.
@ -254,7 +266,7 @@ BuildRequires: libdnf-devel >= 0.22.5
Obsoletes: dnf-plugin-subscription-manager < 1.29.0
%description -n libdnf-plugin-subscription-manager
This package provides a plugin to interact with repositories from the Red Hat
This package provides a plugin to interact with repositories from an
entitlement platform; contains only one product-id binary plugin used by
e.g. microdnf.
@ -279,7 +291,7 @@ Requires: python3-librepo
Requires: dnf >= 1.0.0
%description -n dnf-plugin-subscription-manager
This package provides plugins to interact with repositories and subscriptions
from the Red Hat entitlement platform; contains subscription-manager and
from an entitlement platform; contains subscription-manager and
product-id plugins.
%endif
@ -315,7 +327,7 @@ the remote in the currently deployed .origin file.
%package -n %{rhsm_package_name}
Summary: A Python library to communicate with a Red Hat Unified Entitlement Platform
Summary: A Python library to communicate with a Unified Entitlement Platform
%if 0%{?suse_version}
Group: Development/Libraries/Python
%endif
@ -338,7 +350,7 @@ Provides: python-rhsm = %{version}-%{release}
Obsoletes: python-rhsm <= 1.20.3-1
%description -n %{rhsm_package_name}
A small library for communicating with the REST interface of a Red Hat Unified
A small library for communicating with the REST interface of a Unified
Entitlement Platform. This interface is used for the management of system
entitlements, certificates, and access to content.
@ -407,7 +419,9 @@ popd
# fake out the redhat.repo file
%if %{use_dnf}
mkdir %{buildroot}%{_sysconfdir}/yum.repos.d
%if %{undefined msvsphere_ver}
touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo
%endif
%endif
# fake out the certificate directories
@ -417,9 +431,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/pki/entitlement
%if %{use_container_plugin}
# Setup cert directories for the container plugin:
mkdir -p %{buildroot}%{_sysconfdir}/docker/certs.d/
%if %{undefined msvsphere_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
# fix timestamps on our byte compiled files so they match across arches
find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
@ -615,10 +631,12 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%{python_sitearch}/subscription_manager/plugin/container/__pycache__
%{python_sitearch}/subscription_manager/plugin/container/*.py*
%if %{undefined msvsphere_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
%if %has_ostree
%files -n subscription-manager-plugin-ostree
@ -735,12 +753,19 @@ rmdir %{python_sitearch}/subscription_manager-*-*.egg-info --ignore-fail-on-non-
rm -f /var/lib/rhsm/cache/rhsm_icon.json
%changelog
* Wed Nov 8 2023 Arkady L. Shane <tigro@msvsphere-os.ru> 1.29.38-1.inferit
- De-branded for MSVSphere
- Disable the DNF plugin by default
* Thu Sep 14 2023 Pino Toscano <ptoscano@redhat.com> 1.29.38-1
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (ptoscano@redhat.com)
- ci: bump actions/checkout from 3 to 4
(49699333+dependabot[bot]@users.noreply.github.com)
- ENT-5603: Fix a typo in a comment (mhorky@redhat.com)
* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.29.30-1
- Rebuilt for MSVSphere 9.1.
* Wed Aug 23 2023 Pino Toscano <ptoscano@redhat.com> 1.29.37-1
- Translated using Weblate (Korean) (simmon@nplob.com)
- Update translation files (noreply@weblate.org)
@ -834,6 +859,9 @@ rm -f /var/lib/rhsm/cache/rhsm_icon.json
- 2169251: connection: restore UEPConnection.getJob() (ptoscano@redhat.com)
- ENT-5106: Type-hint subscription_manager/ files (mhorky@redhat.com)
* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.29.33-1
- Rebuilt for MSVSphere 9.1.
* Thu Feb 16 2023 Pino Toscano <ptoscano@redhat.com> 1.29.33-1
- Translated using Weblate (French) (ljanda@redhat.com)
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (suanand@redhat.com)

Loading…
Cancel
Save