From da25704ed2f309b2ac9b0ee3c3f186593b5c6236 Mon Sep 17 00:00:00 2001 From: Yuriy Kohut Date: Thu, 11 Apr 2024 12:39:15 +0300 Subject: [PATCH] Update .spec to include CentOS branding. --- SPECS/preupgrade-assistant-el6toel7.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/SPECS/preupgrade-assistant-el6toel7.spec b/SPECS/preupgrade-assistant-el6toel7.spec index c82ad76..bb69ba6 100644 --- a/SPECS/preupgrade-assistant-el6toel7.spec +++ b/SPECS/preupgrade-assistant-el6toel7.spec @@ -5,8 +5,8 @@ Name: preupgrade-assistant-el6toel7 Version: 0.8.0 -Release: 3%{?dist} -Summary: Set of modules created for upgrade to Red Hat Enterprise Linux 7 +Release: 4%{?dist} +Summary: Set of modules created for upgrade to CentOS release 7 Group: System Environment/Libraries License: GPLv3+ URL: https://github.com/upgrades-migrations/preupgrade-assistant-modules @@ -39,6 +39,7 @@ Requires: python Requires: coreutils Requires: perl + #do not require php even in presence of php scripts #dependency filtering: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering %if 0%{?fedora} || 0%{?rhel} > 6 @@ -53,6 +54,7 @@ Requires: perl ############################## Patch0001: 0001-UEFI-fix-1-2-Fix-the-broken-bootloader-when-upgrade-.patch Patch0002: 0002-UEFI-fix-2-2-Fix-the-broken-bootloader-when-upgrade-.patch +Patch0003: %{name}-%{version}-centos.patch ####### PATCHES END ########## @@ -64,8 +66,7 @@ Patch0002: 0002-UEFI-fix-2-2-Fix-the-broken-bootloader-when-upgrade-.patch %description The package provides a set of modules used for assessment -of the source system for upgrade or migration to Red Hat -Enterprise Linux 7 system. +of the source system for upgrade or migration to CentOS release 7 system. The modules are used by the preupgrade-assistant package. @@ -73,12 +74,16 @@ The modules are used by the preupgrade-assistant package. %setup -q -n %{name}-%{version} %patch0001 -p1 %patch0002 -p1 +%patch0003 -p1 ### REMOVE .orig files # I don't know why, but one .orig file is permanently created... find . -name "*.orig" -delete %build +# Executable flag as patch can't set mode of new file(s) +chmod +x RHEL6_7/packages/NonCentOSSignedPkg/check + # This is all we need here. The RHEL6_7-results dir will be created # with XCCDF files for Preupgrade Assistant and OpenSCAP preupg-xccdf-compose RHEL6_7 @@ -114,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Apr 5 2024 Yuriy Kohut - 0.8.0-4 +- Add CentOS branding with patch: preupgrade-assistant-el6toel7-0.8.0-centos.patch + * Thu Apr 08 2021 Petr Stodulka - 0.8.0-3 - Fix broken bootloader on systems with UEFI when upgrade is run without the --cleanup-post option