From 2374c08b346ecd32764f426ab735887c5a5a0bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=AD=D0=B4=D1=83=D0=B0=D1=80=D0=B4=20=D0=90=D0=B1=D0=B4?= =?UTF-8?q?=D1=83=D0=BB=D0=BB=D0=B8=D0=BD?= Date: Thu, 17 Feb 2022 13:14:02 +0300 Subject: [PATCH] Revert "Fir patch name" This reverts commit 02597dd59c47ecf5cf56a06d6ed7d9cc92b85bdb. --- .../anaconda-almalinux-pyanaconda-tests.patch | 16 ---------------- SPECS/anaconda.spec | 4 ++-- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 SOURCES/anaconda-almalinux-pyanaconda-tests.patch diff --git a/SOURCES/anaconda-almalinux-pyanaconda-tests.patch b/SOURCES/anaconda-almalinux-pyanaconda-tests.patch deleted file mode 100644 index 53be997..0000000 --- a/SOURCES/anaconda-almalinux-pyanaconda-tests.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tests/nosetests/pyanaconda_tests/product_test.py b/tests/nosetests/pyanaconda_tests/product_test.py -index d8c511ff20..f6b657d689 100644 ---- a/tests/nosetests/pyanaconda_tests/product_test.py -+++ b/tests/nosetests/pyanaconda_tests/product_test.py -@@ -293,6 +293,11 @@ class ProductConfigurationTestCase(unittest.TestCase): - ["rhel.conf", "scientific-linux.conf"], - ENTERPRISE_PARTITIONING - ) -+ self._check_default_product( -+ "AlmaLinux", "", -+ ["rhel.conf", "almalinux.conf"], -+ ENTERPRISE_PARTITIONING -+ ) - - def product_module_list_difference_fedora_rhel_test(self): - """Test for expected Fedora & RHEL module list differences.""" diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index aa5f4ad..6cfde45 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -18,8 +18,8 @@ Source1: almalinux.conf Patch1000: anaconda-almalinux-installer-colors.patch Patch1001: anaconda-almalinux-disable-subscription.patch Patch1002: anaconda-almalinux-disable-cdn-radiobutton.patch -Patch1003: anaconda-almalinux-remove-visible-fedora-references.patch -Patch1004: anaconda-almalinux-pyanaconda-tests.patch +Patch1003: anaconda-almalinux-remove-visible-fedrora-references.patch + # Versions of required components (done so we make sure the buildrequires # match the requires versions of things).