diff --git a/SOURCES/msvsphere-certified-local.repo b/SOURCES/msvsphere-local.repo similarity index 53% rename from SOURCES/msvsphere-certified-local.repo rename to SOURCES/msvsphere-local.repo index 3de70bf..c55133b 100644 --- a/SOURCES/msvsphere-certified-local.repo +++ b/SOURCES/msvsphere-local.repo @@ -1,6 +1,6 @@ -[certified-local] -name=MSVSphere $releasever - Certified -baseurl=file:///mnt/certified/Certified +[os-local] +name=MSVSphere $releasever - OS Local +baseurl=file:///mnt/repos/os/OS enabled=0 gpgcheck=1 countme=1 @@ -8,9 +8,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 metadata_expire=86400 enabled_metadata=1 -[certified-local-updates] -name=MSVSphere $releasever - Certified -baseurl=file:///mnt/certified-updates/Certified-updates +[updates-local] +name=MSVSphere $releasever - Updates Local +baseurl=file:///mnt/repos/updates/Updates enabled=0 gpgcheck=1 countme=1 diff --git a/SOURCES/msvsphere-certified.repo b/SOURCES/msvsphere-os.repo similarity index 52% rename from SOURCES/msvsphere-certified.repo rename to SOURCES/msvsphere-os.repo index 46920db..23630eb 100644 --- a/SOURCES/msvsphere-certified.repo +++ b/SOURCES/msvsphere-os.repo @@ -1,7 +1,7 @@ -[certified] -name=MSVSphere $releasever - Certified -mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/certified -# baseurl=https://repo1.msvsphere-os.ru/certified/msvsphere/$releasever/Certified/$basearch/os/ +[os] +name=MSVSphere $releasever - OS +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/os +# baseurl=https://repo1.msvsphere-os.ru/certified/msvsphere/$releasever/OS/$basearch/os/ enabled=1 gpgcheck=1 countme=1 @@ -9,20 +9,20 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 metadata_expire=86400 enabled_metadata=1 -[certified-debuginfo] -name=MSVSphere $releasever - Certified - Debug -mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/certified-debug -# baseurl=https://repo1.msvsphere-os.ru/certified/vault/$releasever/Certified/debug/$basearch/ +[os-debuginfo] +name=MSVSphere $releasever - OS - Debug +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/os-debug +# baseurl=https://repo1.msvsphere-os.ru/certified/vault/$releasever/OS/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 metadata_expire=86400 enabled_metadata=0 -[certified-source] -name=MSVSphere $releasever - Certified - Source -mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/certified-source -# baseurl=https://repo1.msvsphere-os.ru/certified/vault/$releasever/Certified/sources/ +[os-source] +name=MSVSphere $releasever - OS - Source +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/os-source +# baseurl=https://repo1.msvsphere-os.ru/certified/vault/$releasever/OS/sources/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 diff --git a/SOURCES/msvsphere-certified-updates.repo b/SOURCES/msvsphere-updates.repo similarity index 52% rename from SOURCES/msvsphere-certified-updates.repo rename to SOURCES/msvsphere-updates.repo index 21fc143..54efcec 100644 --- a/SOURCES/msvsphere-certified-updates.repo +++ b/SOURCES/msvsphere-updates.repo @@ -1,7 +1,7 @@ -[certified-updates] -name=MSVSphere $releasever - Certified Updates -mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/certified-updates -# baseurl=https://repo1.msvsphere-os.ru/certified/msvsphere/$releasever/Certified-updates/$basearch/os/ +[updates] +name=MSVSphere $releasever - Updates +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/updates +# baseurl=https://repo1.msvsphere-os.ru/certified/msvsphere/$releasever/Updates/$basearch/os/ enabled=0 gpgcheck=1 countme=1 @@ -9,29 +9,29 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 metadata_expire=86400 enabled_metadata=1 -[certified-updates-debuginfo] -name=MSVSphere $releasever - Certified Updates - Debug -mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/certified-updates-debug -# baseurl=https://repo1.msvsphere-os.ru/certified/vault/$releasever/Certified-updates/debug/$basearch/ +[updates-debuginfo] +name=MSVSphere $releasever - Updates - Debug +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/updates-debug +# baseurl=https://repo1.msvsphere-os.ru/certified/vault/$releasever/Updates/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 metadata_expire=86400 enabled_metadata=0 -[certified-updates-source] -name=MSVSphere $releasever - Certified Updates - Source -mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/certified-updates-source -# baseurl=https://repo1.msvsphere-os.ru/certified/vault/$releasever/Certified-updates/sources/ +[updates-source] +name=MSVSphere $releasever - Updates - Source +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/updates-source +# baseurl=https://repo1.msvsphere-os.ru/certified/vault/$releasever/Updates/sources/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 metadata_expire=86400 enabled_metadata=0 -[certified-testing] -name=MSVSphere $releasever - Certified Testing -mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/certified-testing +[testing] +name=MSVSphere $releasever - Testing +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/updates-testing # baseurl=https://repo1.msvsphere-os.ru/certified/msvsphere/$releasever/Testing/$basearch/os/ enabled=0 gpgcheck=1 @@ -40,9 +40,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 metadata_expire=86400 enabled_metadata=1 -[certified-testing-debuginfo] -name=MSVSphere $releasever - Certified Testing - Debug -mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/certified-testing-debug +[testing-debuginfo] +name=MSVSphere $releasever - Testing - Debug +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/updates-testing-debug # baseurl=https://repo1.msvsphere-os.ru/certified/vault/$releasever/Testing/debug/$basearch/ enabled=0 gpgcheck=1 @@ -50,9 +50,9 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 metadata_expire=86400 enabled_metadata=0 -[certified-testing-source] -name=MSVSphere $releasever - Certified Testing - Source -mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/certified-testing-source +[testing-source] +name=MSVSphere $releasever - Testing - Source +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/updates-testing-source # baseurl=https://repo1.msvsphere-os.ru/certified/vault/$releasever/Testing/sources/ enabled=0 gpgcheck=1 diff --git a/SPECS/sphere-release.spec b/SPECS/sphere-release.spec index 2db2d48..99befa5 100644 --- a/SPECS/sphere-release.spec +++ b/SPECS/sphere-release.spec @@ -1,6 +1,6 @@ %global distro MSVSphere # define MSVSphere products -%global release_name Certified Server ARM Cinnamon KDE XFCE +%global release_name ARMCertified ServerCertified Server ARM Cinnamon KDE XFCE %global major 9 %global minor 5 %global eol_date 2032-06-01 @@ -66,9 +66,9 @@ Source506: msvsphere-nfv.repo Source507: msvsphere-highavailability.repo Source508: msvsphere-resilientstorage.repo Source509: msvsphere-testing.repo -Source510: msvsphere-certified.repo -Source511: msvsphere-certified-updates.repo -Source512: msvsphere-certified-local.repo +Source510: msvsphere-os.repo +Source511: msvsphere-updates.repo +Source512: msvsphere-local.repo %description %{distro} release files. @@ -91,10 +91,10 @@ Obsoletes: redhat-release-eula < %{version}-%{release} Release files common to all Editions and Spins of MSVSphere -%package certified -Summary: Base package for MSVSphere Certified-specific default configurations +%package arm-certified +Summary: Base package for MSVSphere ARM Certified-specific default configurations -RemovePathPostfixes: .Certified +RemovePathPostfixes: .ARMCertified Provides: sphere-release-variant = %{version}-%{release} Provides: system-release Provides: system-release(%{version}) @@ -105,27 +105,64 @@ Requires: sphere-repos-certified = %{version}-%{release} # sphere-release-common Requires: sphere-release-identity, so at least one # package must provide it. This Recommends: pulls in # sphere-release-identity-certified if nothing else is already doing so. -Recommends: sphere-release-identity-certified +Recommends: sphere-release-identity-arm-certified -%description certified -Provides a base package for MSVSphere Certified-specific configuration files to +%description arm-certified +Provides a base package for MSVSphere ARM Certified-specific configuration files to depend on. -%package identity-certified -Summary: Package providing the identity for MSVSphere Certified Edition +%package identity-arm-certified +Summary: Package providing the identity for MSVSphere ARM Certified Edition -RemovePathPostfixes: .Certified +RemovePathPostfixes: .ARMCertified Provides: sphere-release-identity = %{version}-%{release} Conflicts: sphere-release-identity -Requires(meta): sphere-release-certified = %{version}-%{release} +Requires(meta): sphere-release-arm-certified = %{version}-%{release} Requires(pre): /usr/bin/ln -%description identity-certified +%description identity-arm-certified Provides the necessary files for a MSVSphere installation that is identifying -itself as MSVSphere Certified Edition. +itself as MSVSphere ARM Certified Edition. + + +%package server-certified +Summary: Base package for MSVSphere Server Certified-specific default configurations + +RemovePathPostfixes: .ServerCertified +Provides: sphere-release-variant = %{version}-%{release} +Provides: system-release +Provides: system-release(%{version}) +Provides: base-module(platform:f%{version}) +Requires: sphere-release-common = %{version}-%{release} +Requires: sphere-repos-certified = %{version}-%{release} + +# sphere-release-common Requires: sphere-release-identity, so at least one +# package must provide it. This Recommends: pulls in +# sphere-release-identity-certified if nothing else is already doing so. +Recommends: sphere-release-identity-server-certified + + +%description server-certified +Provides a base package for MSVSphere Server Certified-specific configuration files to +depend on. + + +%package identity-server-certified +Summary: Package providing the identity for MSVSphere Server Certified Edition + +RemovePathPostfixes: .ServerCertified +Provides: sphere-release-identity = %{version}-%{release} +Conflicts: sphere-release-identity +Requires(meta): sphere-release-server-certified = %{version}-%{release} +Requires(pre): /usr/bin/ln + + +%description identity-server-certified +Provides the necessary files for a MSVSphere installation that is identifying +itself as MSVSphere Server Certified Edition. %package server @@ -376,18 +413,23 @@ cp %{SOURCE200} ./docs install -d -m 0755 %{buildroot}%{_prefix}/lib for variant in %{release_name}; do -echo "%{distro} release %{major}.%{minor}%{?beta: %{beta}} (${variant})" > %{buildroot}%{_prefix}/lib/sphere-release.$variant - +en_variant=$variant if [ "$variant" = "ARM" ]; then ru_variant="АРМ" elif [ "$variant" = "Server" ]; then ru_variant="Сервер" -elif [ "$variant" = "Certified" ]; then - ru_variant="Сертифицированная" +elif [ "$variant" = "ARMCertified" ]; then + en_variant="ARM Certified" + ru_variant="АРМ Сертифицированная" +elif [ "$variant" = "ServerCertified" ]; then + en_variant="Server Certified" + ru_variant="Сервер Сертифицированная" else ru_variant=$variant fi +echo "%{distro} release %{major}.%{minor}%{?beta: %{beta}} (${en_variant})" > %{buildroot}%{_prefix}/lib/sphere-release.$variant + # ------------------------------------------------------------------------- # Definitions for /etc/os-release and for macros in macros.dist. These # macros are useful for spec files where distribution-specific identifiers @@ -407,12 +449,12 @@ fi cat > %{buildroot}%{_prefix}/lib/os-release.$variant << EOF NAME="%{distro}" -VERSION="%{major}.%{minor}%{?beta: %{beta}} (${variant})" +VERSION="%{major}.%{minor}%{?beta: %{beta}} (${en_variant})" ID="msvsphere" ID_LIKE="rhel centos fedora" VERSION_ID="%{major}.%{minor}" PLATFORM_ID="platform:el%{major}" -PRETTY_NAME="%{distro} %{major}.%{minor}%{?beta: %{beta}} ${variant}" +PRETTY_NAME="%{distro} %{major}.%{minor}%{?beta: %{beta}} ${en_variant}" ANSI_COLOR="1;35" LOGO="fedora-logo-icon" CPE_NAME="cpe:/o:ncsd:msvsphere:%{major}::baseos" @@ -424,8 +466,12 @@ BUG_REPORT_URL="%{dist_bug_report_url}" MSVSPHERE_MANTISBT_PROJECT="%{distro}-%{major}" MSVSPHERE_MANTISBT_PROJECT_VERSION="%{major}.%{minor}" MSVSPHERE_PRETTY_NAME="МСВСфера %{major}.%{minor}%{?beta: %{beta}} ${ru_variant}" +EOF +if [ "$variant" == "${variant/Certified/}" ]; then +cat >> %{buildroot}%{_prefix}/lib/os-release.$variant << EOF SUPPORT_END=%{eol_date} EOF +fi done install -d -m 0755 %{buildroot}%{_sysconfdir} @@ -572,10 +618,16 @@ fi %preun identity-arm /usr/bin/rm -f /usr/share/sphere-release/EULA -%post identity-certified +%post identity-arm-certified /usr/bin/ln -srf /usr/share/sphere-release/EULA-CERTIFIED /usr/share/sphere-release/EULA -%preun identity-certified +%preun identity-arm-certified +/usr/bin/rm -f /usr/share/sphere-release/EULA + +%post identity-server-certified +/usr/bin/ln -srf /usr/share/sphere-release/EULA-CERTIFIED /usr/share/sphere-release/EULA + +%preun identity-server-certified /usr/bin/rm -f /usr/share/sphere-release/EULA %post identity-server @@ -604,10 +656,17 @@ fi %{_prefix}/lib/sysctl.d/50-redhat.conf -%files certified -%files identity-certified -%{_prefix}/lib/os-release.Certified -%{_prefix}/lib/sphere-release.Certified +%files arm-certified +%files identity-arm-certified +%{_prefix}/lib/os-release.ARMCertified +%{_prefix}/lib/sphere-release.ARMCertified +%{_datadir}/sphere-release/EULA-CERTIFIED + + +%files server-certified +%files identity-server-certified +%{_prefix}/lib/os-release.ServerCertified +%{_prefix}/lib/sphere-release.ServerCertified %{_datadir}/sphere-release/EULA-CERTIFIED @@ -659,9 +718,9 @@ fi %config(noreplace) %{_sysconfdir}/dnf/vars/stream %files -n sphere-repos-certified -%config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-certified.repo -%config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-certified-local.repo -%config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-certified-updates.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-os.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-local.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-updates.repo %files -n sphere-repos-extra %config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-devel.repo @@ -678,6 +737,8 @@ fi %changelog * Wed Jan 22 2025 Arkady L. Shane - 9.5-5 - Added Testing repo and fix path for local updates +- Added ARM and Server Certified subpackages +- Update License file for Certified variants * Tue Jan 21 2025 Arkady L. Shane - 9.5-4 - Fix in requires