From b14656fe9d197225b9a968512a4169d00a201306 Mon Sep 17 00:00:00 2001 From: tigro Date: Tue, 12 Mar 2024 15:40:41 +0300 Subject: [PATCH] - Remove redhat-release-server and redhat-release-eula - Remove /usr/share/redhat-release at first install --- SPECS/sphere-release.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/SPECS/sphere-release.spec b/SPECS/sphere-release.spec index db7d0aa..1d66946 100644 --- a/SPECS/sphere-release.spec +++ b/SPECS/sphere-release.spec @@ -6,7 +6,7 @@ Name: sphere-release Version: %{major}.%{minor} -Release: 2%{?dist}.1 +Release: 3%{?dist} Summary: %{distro} release files License: GPLv2 URL: https://msvsphere-os.ru @@ -79,6 +79,9 @@ Requires: sphere-release = %{version}-%{release} Requires: sphere-repos(%{version}) Requires: sphere-release-identity = %{version}-%{release} +Obsoletes: redhat-release-server < %{version}-%{release} +Obsoletes: redhat-release-eula < %{version}-%{release} + %description common Release files common to all Editions and Spins of MSVSphere @@ -448,6 +451,14 @@ install -p -m 0644 %{SOURCE509} %{buildroot}%{_sysconfdir}/yum.repos.d/ install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg install -p -m 0644 %{SOURCE100} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ +%pre -n sphere-release-common +# Workarround for redhat-server-eula problem +if [ $1 = 1 ]; then + if [ -d /usr/share/redhat-release ]; then + rm -rf /usr/share/redhat-release + fi +fi + %post -n sphere-repos-flatpak /usr/bin/flatpak remote-add --system --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo ||: /usr/bin/flatpak remote-add --system --if-not-exists fedora oci+https://registry.fedoraproject.org ||: @@ -548,6 +559,10 @@ install -p -m 0644 %{SOURCE100} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %changelog +* Tue Mar 12 2024 Arkady L. Shane - 9.3-3 +- Remove redhat-release-server and redhat-release-eula +- Remove /usr/share/redhat-release at first install + * Mon Dec 25 2023 Arkady L. Shane - 9.3-2.1 - Drop sphere urls