diff --git a/SOURCES/0001-Debrand-for-MSVSphere.patch b/SOURCES/0001-Debrand-for-MSVSphere.patch index 8412c8b..705176b 100644 --- a/SOURCES/0001-Debrand-for-MSVSphere.patch +++ b/SOURCES/0001-Debrand-for-MSVSphere.patch @@ -1,42 +1,41 @@ -From 2572c02cde4a2873f9018f7b53a8a743adca04c0 Mon Sep 17 00:00:00 2001 -From: Eugene Zamriy -Date: Sun, 2 Apr 2023 19:02:09 +0300 -Subject: [PATCH 1/3] Debrand for MSVSphere +From 6f1bb300be19c34eb7f49ddc3ddff166d48e478d Mon Sep 17 00:00:00 2001 +From: tigro +Date: Tue, 2 Apr 2024 19:03:24 +0300 +Subject: [PATCH] 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/de.po | 4 ++-- + po/es.po | 4 ++-- + po/fr.po | 4 ++-- po/gu.po | 4 ++-- po/hi.po | 4 ++-- - po/it.po | 6 +++--- - po/ja.po | 6 +++--- + po/it.po | 4 ++-- + po/ja.po | 4 ++-- po/ka.po | 4 ++-- - po/keys.pot | 4 ++-- po/kn.po | 4 ++-- - po/ko.po | 6 +++--- + po/ko.po | 4 ++-- 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/pt_BR.po | 4 ++-- + po/ru.po | 4 ++-- po/si.po | 4 ++-- po/ta_IN.po | 4 ++-- po/te.po | 4 ++-- - po/zh_CN.po | 6 +++--- - po/zh_TW.po | 6 +++--- + po/zh_CN.po | 4 ++-- + po/zh_TW.po | 4 ++-- src/subscription_manager/repolib.py | 2 +- - 25 files changed, 61 insertions(+), 61 deletions(-) + 24 files changed, 47 insertions(+), 47 deletions(-) diff --git a/po/as.po b/po/as.po -index 0de316b..e44098c 100644 +index b903623..5a655ef 100644 --- a/po/as.po +++ b/po/as.po -@@ -4306,8 +4306,8 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4317,8 +4317,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -47,11 +46,11 @@ index 0de316b..e44098c 100644 msgstr "" diff --git a/po/bn_IN.po b/po/bn_IN.po -index 1db79ec..2303d20 100644 +index ea83766..794d495 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po -@@ -4363,8 +4363,8 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4373,8 +4373,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -62,11 +61,11 @@ index 1db79ec..2303d20 100644 msgstr "" diff --git a/po/de.po b/po/de.po -index 9512356..4fc1839 100644 +index 87441fd..750992b 100644 --- a/po/de.po +++ b/po/de.po -@@ -4065,11 +4065,11 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4117,8 +4117,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -75,17 +74,13 @@ index 9512356..4fc1839 100644 +"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." + "Die yum/dnf-Plugins: %s wurden automatisch zum Nutzen von Red Hat " diff --git a/po/es.po b/po/es.po -index c12a01e..af98be2 100644 +index 8eadf14..0df0b27 100644 --- a/po/es.po +++ b/po/es.po -@@ -4061,12 +4061,12 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4114,8 +4114,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -94,19 +89,13 @@ index c12a01e..af98be2 100644 +"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 + "Los plugins yum/dnf: %s se habilitaron automáticamente en beneficio de Red " diff --git a/po/fr.po b/po/fr.po -index 9737912..f47fa50 100644 +index 2641df4..47980c5 100644 --- a/po/fr.po +++ b/po/fr.po -@@ -3947,12 +3947,12 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -3999,8 +3999,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -115,19 +104,13 @@ index 9737912..f47fa50 100644 +"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." - + "Les greffons yum : %s ont été activées automatiquement au bénéfice de Red " diff --git a/po/gu.po b/po/gu.po -index d9a73a2..7942da3 100644 +index 19a6bea..2b2bf46 100644 --- a/po/gu.po +++ b/po/gu.po -@@ -4298,8 +4298,8 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4310,8 +4310,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -138,11 +121,11 @@ index d9a73a2..7942da3 100644 msgstr "" diff --git a/po/hi.po b/po/hi.po -index 39b4c7a..fe24e54 100644 +index 8bc9211..e380c48 100644 --- a/po/hi.po +++ b/po/hi.po -@@ -4316,8 +4316,8 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4328,8 +4328,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -153,11 +136,11 @@ index 39b4c7a..fe24e54 100644 msgstr "" diff --git a/po/it.po b/po/it.po -index 6c97a42..c71df6a 100644 +index f764980..b7fe05e 100644 --- a/po/it.po +++ b/po/it.po -@@ -3995,12 +3995,12 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -3978,8 +3978,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -167,17 +150,12 @@ index 6c97a42..c71df6a 100644 "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 +index 5eed3b8..37b58bb 100644 --- a/po/ja.po +++ b/po/ja.po -@@ -3841,11 +3841,11 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -3881,8 +3881,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -186,32 +164,13 @@ index 6dd5482..6cfe667 100644 +"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\" で無効にします。" - + "yum/dnf プラグイン: Red Hat サブスクリプション管理に対して %s が自動的に有効" diff --git a/po/ka.po b/po/ka.po -index 7276d25..4eb9511 100644 +index 4124bbb..a9533d8 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 +@@ -3241,8 +3241,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -222,11 +181,11 @@ index b2f60b6..97a6d09 100644 msgstr "" diff --git a/po/kn.po b/po/kn.po -index 70e13b0..2fe73e6 100644 +index ccf94eb..b7cb83e 100644 --- a/po/kn.po +++ b/po/kn.po -@@ -4463,8 +4463,8 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4475,8 +4475,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -237,11 +196,11 @@ index 70e13b0..2fe73e6 100644 msgstr "" diff --git a/po/ko.po b/po/ko.po -index 8b1db39..1aabdde 100644 +index d9a8875..65ffcdb 100644 --- a/po/ko.po +++ b/po/ko.po -@@ -3790,11 +3790,11 @@ msgstr "오류: 출시 제품 인증서가 두 개 이상 설치되어 있습니 - #: src/subscription_manager/repolib.py:85 +@@ -3827,8 +3827,8 @@ msgstr "오류: 출시 제품 인증서가 두 개 이상 설치되어 있습니 + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -250,17 +209,13 @@ index 8b1db39..1aabdde 100644 +"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\"을 사용하여 이 동작을 차단하십시오." - + "yum 플러그인: %s이 Red Hat 서브스크립션 관리를 통해 자동으로 활성화되었습니" diff --git a/po/ml.po b/po/ml.po -index 65c8cc1..bbc6210 100644 +index f78ca75..0b804c1 100644 --- a/po/ml.po +++ b/po/ml.po -@@ -4415,8 +4415,8 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4426,8 +4426,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -271,11 +226,11 @@ index 65c8cc1..bbc6210 100644 msgstr "" diff --git a/po/mr.po b/po/mr.po -index 94db60f..6a81e59 100644 +index 75a2457..d9e2a5a 100644 --- a/po/mr.po +++ b/po/mr.po -@@ -4400,8 +4400,8 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4411,8 +4411,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -286,11 +241,11 @@ index 94db60f..6a81e59 100644 msgstr "" diff --git a/po/or.po b/po/or.po -index 2a35651..df8cb18 100644 +index 0302ffa..5a96c13 100644 --- a/po/or.po +++ b/po/or.po -@@ -4404,8 +4404,8 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4415,8 +4415,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -301,11 +256,11 @@ index 2a35651..df8cb18 100644 msgstr "" diff --git a/po/pa.po b/po/pa.po -index 42f74ab..83035f9 100644 +index 0bdec5c..80730a4 100644 --- a/po/pa.po +++ b/po/pa.po -@@ -4343,8 +4343,8 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4350,8 +4350,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -316,11 +271,11 @@ index 42f74ab..83035f9 100644 msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po -index 354bfe1..cdb6379 100644 +index 54cd731..b141332 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po -@@ -4086,12 +4086,12 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4119,8 +4119,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -330,17 +285,12 @@ index 354bfe1..cdb6379 100644 "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 +index 10eedae..4bbb479 100644 --- a/po/ru.po +++ b/po/ru.po -@@ -4027,12 +4027,12 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4065,8 +4065,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -350,17 +300,12 @@ index 4982dcc..a9d9c82 100644 "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 +index 41b4686..cb42c49 100644 --- a/po/si.po +++ b/po/si.po -@@ -3195,8 +3195,8 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -3241,8 +3241,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -371,11 +316,11 @@ index 700e75a..b6bacf0 100644 msgstr "" diff --git a/po/ta_IN.po b/po/ta_IN.po -index 2880e59..fd743fd 100644 +index d9123be..09528f9 100644 --- a/po/ta_IN.po +++ b/po/ta_IN.po -@@ -4457,8 +4457,8 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4467,8 +4467,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -386,11 +331,11 @@ index 2880e59..fd743fd 100644 msgstr "" diff --git a/po/te.po b/po/te.po -index e8c2c08..018631b 100644 +index 69bf2ac..af59781 100644 --- a/po/te.po +++ b/po/te.po -@@ -4371,8 +4371,8 @@ msgstr "" - #: src/subscription_manager/repolib.py:85 +@@ -4381,8 +4381,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -401,11 +346,11 @@ index e8c2c08..018631b 100644 msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po -index 3187e98..7e2ce5e 100644 +index 2e76242..f06a2b5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po -@@ -3697,11 +3697,11 @@ msgstr "错误:安装了多个发行产品证书。证书路径:%s" - #: src/subscription_manager/repolib.py:85 +@@ -3737,8 +3737,8 @@ msgstr "错误:安装了多个发行产品证书。证书路径:%s" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -414,17 +359,13 @@ index 3187e98..7e2ce5e 100644 +"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\" 来" - "禁用它。" - + "yum/dnf plugins: %s 会为 Red Hat Subscription Management 自动启用。如果不需" diff --git a/po/zh_TW.po b/po/zh_TW.po -index 877e5b9..76c1278 100644 +index 30eae88..0cb78fd 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po -@@ -3923,11 +3923,11 @@ msgstr "錯誤:安裝了超過一個發行產品憑證。憑證路徑:%s" - #: src/subscription_manager/repolib.py:85 +@@ -3955,8 +3955,8 @@ msgstr "錯誤:安裝了超過一個發行產品憑證。憑證路徑:%s" + #: src/subscription_manager/repolib.py:94 #, python-format msgid "" -"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " @@ -433,17 +374,13 @@ index 877e5b9..76c1278 100644 +"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”來阻止此行" - "為。" - + "yum / dnf插件:%s自動啟用以獲得Red Hat訂閱管理。 如果不需要,請使" diff --git a/src/subscription_manager/repolib.py b/src/subscription_manager/repolib.py -index dc649ea..fb1dc0d 100644 +index 4e7c016..f5c0d13 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): +@@ -92,7 +92,7 @@ class YumPluginManager: + 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 " @@ -452,5 +389,5 @@ index dc649ea..fb1dc0d 100644 "block this behavior." ) % ", ".join(enabled_yum_plugins) -- -2.39.2 +2.44.0 diff --git a/SOURCES/0003-Disable-repo-file-creation.patch b/SOURCES/0003-Disable-repo-file-creation.patch index 7e4383c..4483138 100644 --- a/SOURCES/0003-Disable-repo-file-creation.patch +++ b/SOURCES/0003-Disable-repo-file-creation.patch @@ -1,19 +1,19 @@ -From 986f7bbc6a13609b323cc83c318f93ee0723f398 Mon Sep 17 00:00:00 2001 -From: Eugene Zamriy -Date: Sun, 2 Apr 2023 19:03:40 +0300 -Subject: [PATCH 3/3] Disable repo file creation +From 75078e90d2fb7ab6ef68c8232f7e695acff92e44 Mon Sep 17 00:00:00 2001 +From: tigro +Date: Tue, 2 Apr 2024 19:06:58 +0300 +Subject: [PATCH] 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 +index cc98803..78c7ce2 100644 --- a/src/subscription_manager/repofile.py +++ b/src/subscription_manager/repofile.py -@@ -370,11 +370,7 @@ class RepoFileBase(object): +@@ -375,11 +375,7 @@ class RepoFileBase: + """ Try to create new repo file. - :return: None """ - self.create_dir_path() - if self.path_exists(self.path) or not self.manage_repos: @@ -22,8 +22,8 @@ index 650d963..8bda5f7 100644 - f.write(self.REPOFILE_HEADER) + pass - def fix_content(self, content): + def fix_content(self, content: str) -> str: return content -- -2.39.2 +2.44.0 diff --git a/SOURCES/0004-Disable-subscription-manager-plugin.patch b/SOURCES/0004-Disable-subscription-manager-plugin.patch index 1170bba..16785f9 100644 --- a/SOURCES/0004-Disable-subscription-manager-plugin.patch +++ b/SOURCES/0004-Disable-subscription-manager-plugin.patch @@ -1,7 +1,7 @@ -From eb4d34e3264e31cbd3a17626a3abf7705bb52059 Mon Sep 17 00:00:00 2001 -From: Eugene Zamriy -Date: Sun, 2 Apr 2023 19:15:32 +0300 -Subject: [PATCH 4/4] Disable subscription manager plugin +From 334cd94ab1579653e76a9962b748fd11460badab Mon Sep 17 00:00:00 2001 +From: tigro +Date: Tue, 2 Apr 2024 19:07:46 +0300 +Subject: [PATCH] Disable subscription manager plugin --- etc-conf/plugin/subscription-manager.conf | 2 +- @@ -19,5 +19,5 @@ index 9050582..2392f67 100644 # 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 +2.44.0 diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index e452d93..169247c 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -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 @@ -361,6 +373,11 @@ cloud metadata and signatures. %prep %setup -q +%patch1001 -p1 +%patch1002 -p1 +%patch1003 -p1 +%patch1004 -p1 + %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \