From 6d7106f64fb71ea70bff829cded9c90cf16dff40 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 21 Feb 2023 14:58:00 -0600 Subject: [PATCH] Drop Conflicts/Obsoletes for ancient Ignition releases We're only required to support upgrading from Fedora N-2. --- ignition.rpmlintrc | 1 - ignition.spec | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ignition.rpmlintrc b/ignition.rpmlintrc index 18e5612..8d4c2aa 100644 --- a/ignition.rpmlintrc +++ b/ignition.rpmlintrc @@ -10,5 +10,4 @@ addFilter("ignition-validate-redistributable.noarch: E: arch-independent-package # This is documented as optional # https://fedoraproject.org/wiki/Upgrade_paths_%E2%80%94_renaming_or_splitting_packages#Do_I_need_to_Provide_my_old_package_names.3F -addFilter("ignition.x86_64: W: obsolete-not-provided ignition-dracut") addFilter("ignition-validate-redistributable.noarch: W: obsolete-not-provided ignition-validate-nonlinux") diff --git a/ignition.spec b/ignition.spec index 5156b16..c28afbf 100644 --- a/ignition.spec +++ b/ignition.spec @@ -39,8 +39,6 @@ Requires: gdisk Requires: dracut Requires: dracut-network -Obsoletes: ignition-dracut < 0.31.0-3 - # Generated by `go-mods-to-bundled-provides.py | sort` Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.2.3 Provides: bundled(golang(cloud.google.com/go/storage)) = 1.29.0 @@ -169,8 +167,6 @@ the configuration. Summary: Validation tool for Ignition configs License: ASL 2.0 -Conflicts: ignition < 0.31.0-3 - %description validate Ignition is a utility used to manipulate systems during the initramfs. This includes partitioning disks, formatting partitions, writing files @@ -190,8 +186,6 @@ Summary: Statically linked validation tool for Ignition configs License: ASL 2.0 BuildArch: noarch -Conflicts: ignition < 0.31.0-3 - # In case someone has this subpackage installed, obsolete the old name # Drop in Fedora 38 Obsoletes: ignition-validate-nonlinux < 2.13.0-4 @@ -309,6 +303,7 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %changelog * Tue Feb 21 2023 Benjamin Gilbert - 2.15.0-1 - New release +- Drop Conflicts/Obsoletes for ancient Ignition releases * Thu Jan 19 2023 Fedora Release Engineering - 2.14.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild