From d3f89711aa7cceacc3cb613a732da036266475cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Thu, 13 Feb 2025 15:27:08 +0100 Subject: [PATCH] Add upper bound to unversioned obsoletes Obsoleting the versioned rpms without bounds prevents the distribution to ever switch back to versioned rpms if desired. Adding an upper bound is the first step of doing that switch. Related: RHEL-67814 --- nodejs22.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nodejs22.spec b/nodejs22.spec index 3a0c165..d53330a 100644 --- a/nodejs22.spec +++ b/nodejs22.spec @@ -227,7 +227,7 @@ Provides: nodejs = %{nodejs_envr} # preferable to an "extra" interpreter. For example, nodejs-20.5.0 will # replace nodejs20-20.6.0. %define unversioned_obsoletes_of_nodejsXX_if_default() %{expand:\ -Obsoletes: nodejs%{nodejs_pkg_major}%{?1:-%{1}}\ +Obsoletes: nodejs%{nodejs_pkg_major}%{?1:-%{1}} < %{nodejs_envr}\ Provides: nodejs%{nodejs_pkg_major}%{?1:-%{1}} = %{nodejs_envr}\ } %else @@ -489,7 +489,7 @@ Obsoletes: npm < 1:9 # Obsolete others. We can't use %%unversioned_obsoletes_of_nodejsXX_if_default # here because the Provides: needs its own version -Obsoletes: nodejs%{nodejs_pkg_major}-npm +Obsoletes: nodejs%{nodejs_pkg_major}-npm < %{npm_envr} Provides: nodejs%{nodejs_pkg_major}-npm = %{npm_envr} %endif