From 220eacb37fe6c62dc07413294f2528ba002b7829 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 5 Nov 2024 15:51:10 -0500 Subject: [PATCH] Make make a provider for make-latest When upgrading from rhel 9 to rhel 10, there may not be a make-latest package available. We therefore make the make package a provider for make-latest and the versioned make package. That way, if make-latest was installed but isn't available in the next release, make gets installed instead, until a dedicated version of make-latest gets provided. This solution isn't ideal as make-latest is installed on an alternative path, but it covers the case when the user as set its PATH to add /opt/rhel/makeNNN. Resolves: RHEL-33540 --- make.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/make.spec b/make.spec index 8b3788d..a78e49a 100644 --- a/make.spec +++ b/make.spec @@ -5,14 +5,14 @@ Name: make Epoch: 1 Version: 4.4.1 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL-3.0-or-later AND LGPL-2.1-or-later AND GFDL-1.3-or-later AND FSFULLR URL: http://www.gnu.org/software/make/ Source: ftp://ftp.gnu.org/gnu/make/make-%{version}.tar.gz %if "%{name}" != "make" # Set this to the sub-package base name, for "make-latest" -%global make make441 +%global make %(echo make%{version} | tr -d .) %if 0%{?rhel} > 0 %global _prefix /opt/rh/%{make} %else @@ -24,6 +24,8 @@ Summary: Meta package to include latest version of make %else %global make %{name} Summary: A GNU tool which simplifies the build process for users +Provides: make-latest = %{version}-%{release} +Provides: %(echo make%{version} | tr -d .) = %{version}-%{release} %endif %if 0%{?rhel} > 0 @@ -134,6 +136,9 @@ echo ============END TESTING=========== %{_includedir}/gnumake.h %changelog +* Tue Nov 5 2024 DJ Delorie - 1:4.4.1-9 +- Ensure that we can upgrade from make-latest to make (RHEL-33540) + * Tue Oct 29 2024 Troy Dawson - 1:4.4.1-8 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018