diff --git a/SPECS/sphere-release.spec b/SPECS/sphere-release.spec index 6688a34..1d66946 100644 --- a/SPECS/sphere-release.spec +++ b/SPECS/sphere-release.spec @@ -6,7 +6,7 @@ Name: sphere-release Version: %{major}.%{minor} -Release: 0.4%{?dist} +Release: 3%{?dist} Summary: %{distro} release files License: GPLv2 URL: https://msvsphere-os.ru @@ -34,6 +34,7 @@ Requires: sphere-release-common = %{version}-%{release} Source100: RPM-GPG-KEY-MSVSphere-9 Source200: LICENSE +Source201: EULA Source202: EULA-ARM Source203: EULA-SERVER @@ -73,11 +74,14 @@ Summary: MSVSphere release files Requires: sphere-release-variant = %{version}-%{release} -Suggests: sphere-release +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 @@ -86,7 +90,6 @@ Release files common to all Editions and Spins of MSVSphere Summary: Base package for MSVSphere Server-specific default configurations RemovePathPostfixes: .Server -Provides: sphere-release = %{version}-%{release} Provides: sphere-release-variant = %{version}-%{release} Provides: system-release Provides: system-release(%{version}) @@ -122,7 +125,6 @@ itself as MSVSphere Server Edition. Summary: Base package for MSVSphere ARM-specific default configurations RemovePathPostfixes: .ARM -Provides: sphere-release = %{version}-%{release} Provides: sphere-release-variant = %{version}-%{release} Provides: system-release Provides: system-release(%{version}) @@ -159,7 +161,6 @@ itself as MSVSphere ARM Edition. Summary: Base package for MSVSphere Cinnamon-specific default configurations RemovePathPostfixes: .Cinnamon -Provides: sphere-release = %{version}-%{release} Provides: sphere-release-variant = %{version}-%{release} Provides: system-release Provides: system-release(%{version}) @@ -195,7 +196,6 @@ itself as MSVSphere Cinnamon Edition. Summary: Base package for MSVSphere KDE-specific default configurations RemovePathPostfixes: .KDE -Provides: sphere-release = %{version}-%{release} Provides: sphere-release-variant = %{version}-%{release} Provides: system-release Provides: system-release(%{version}) @@ -231,7 +231,6 @@ itself as MSVSphere KDE Edition. Summary: Base package for MSVSphere XFCE-specific default configurations RemovePathPostfixes: .XFCE -Provides: sphere-release = %{version}-%{release} Provides: sphere-release-variant = %{version}-%{release} Provides: system-release Provides: system-release(%{version}) @@ -347,10 +346,6 @@ PRETTY_NAME="%{distro} %{major}.%{minor}%{?beta: %{beta}} ${variant}" ANSI_COLOR="1;35" LOGO="fedora-logo-icon" CPE_NAME="cpe:/o:ncsd:msvsphere:%{major}::baseos" -HOME_URL="https://msvsphere-os.ru/" -BUG_REPORT_URL="https://bugs.msvsphere-os.ru/" -DOCUMENTATION_URL="https://docs.msvsphere-os.ru/" -SUPPORT_URL="https://support.msvsphere-os.ru/" VENDOR_NAME="LLC NCSD" MSVSPHERE_MANTISBT_PROJECT="%{distro}-%{major}" @@ -456,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 ||: @@ -556,19 +559,36 @@ install -p -m 0644 %{SOURCE100} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %changelog -* Fri Nov 3 2023 Arkady L. Shane - 9.3-0.4 +* 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 + +* Wed Dec 6 2023 Arkady L. Shane - 9.3-2 +- Always install sphere-release + +* Thu Nov 9 2023 Arkady L. Shane - 9.3-1 +- Update to 9.3 + +* Tue Oct 31 2023 Arkady L. Shane - 9.2-5 - Drop REDHAT_SUPPORT* from /etc/os-release + +* Mon Oct 39 2023 Arkady L. Shane - 9.2-4.1 +- Added R: /usr/bin/ln + +* Mon Oct 39 2023 Arkady L. Shane - 9.2-4 - Push two separated license for Server and ARM -* Fri Oct 27 2023 Arkady L. Shane - 9.3-0.3 +* Fri Oct 27 2023 Arkady L. Shane - 9.2-3 - Drop brackets from PRETTY_NAME (INF-721) -* Sun Oct 22 2023 Arkady L. Shane - 9.3-0.2 -- Added new field MSVSPHERE_PRETTY_NAME +* Mon Oct 17 2023 Arkady L. Shane - 9.2-2 - Replace PGP public key -* Mon Oct 9 2023 Arkady L. Shane - 9.3-0.1 -- Rebuilt for MSVSphere 9.3 +* Tue Oct 10 2023 Arkady L. Shane - 9.2-1.12 +- Added new field MSVSPHERE_PRETTY_NAME * Fri Sep 22 2023 Arkady L. Shane - 9.2-1.11 - Fix base urls in repo files