diff --git a/SPECS/azurelinux-release/azurelinux-release.spec b/SPECS/azurelinux-release/azurelinux-release.spec index 3734b4579e2..efc2a87b4da 100644 --- a/SPECS/azurelinux-release/azurelinux-release.spec +++ b/SPECS/azurelinux-release/azurelinux-release.spec @@ -1,10 +1,11 @@ %define dist_version 3 +%define distro_release_version_no_time %(echo %{distro_release_version} | cut -d. -f 1-3) Summary: Azure Linux release files Name: azurelinux-release Version: %{dist_version}.0 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux @@ -35,24 +36,24 @@ install -d %{buildroot}%{_rpmmacrodir} cat <<-"EOF" > %{buildroot}%{_libdir}/azurelinux-release %{distribution} %{version} -AZURELINUX_BUILD_NUMBER=%{mariner_build_number} +AZURELINUX_BUILD_NUMBER=%{distro_release_version_no_time} EOF ln -sv ..%{_libdir}/azurelinux-release %{buildroot}%{_sysconfdir}/azurelinux-release cat <<-"EOF" > %{buildroot}%{_libdir}/lsb-release DISTRIB_ID="azurelinux" -DISTRIB_RELEASE="%{version}" +DISTRIB_RELEASE="%{distro_release_version_no_time}" DISTRIB_CODENAME=AzureLinux DISTRIB_DESCRIPTION="%{distribution} %{version}" EOF ln -sv ..%{_libdir}/lsb-release %{buildroot}%{_sysconfdir}/lsb-release cat <<-"EOF" > %{buildroot}%{_libdir}/os-release -NAME="%{distribution}" -VERSION="%{version}" +NAME="Microsoft %{distribution}" +VERSION="%{distro_release_version_no_time}" ID=azurelinux VERSION_ID="%{version}" -PRETTY_NAME="%{distribution} %{version}" +PRETTY_NAME="Microsoft %{distribution} %{version}" ANSI_COLOR="1;34" HOME_URL="%{url}" BUG_REPORT_URL="%{url}" @@ -61,12 +62,12 @@ EOF ln -sv ..%{_libdir}/os-release %{buildroot}%{_sysconfdir}/os-release cat <<-"EOF" > %{buildroot}%{_libdir}/issue -Welcome to %{distribution} %{version} (%{_arch}) - (\l) +Welcome to Microsoft %{distribution} %{version} (%{_arch}) - (\l) EOF ln -sv ..%{_libdir}/issue %{buildroot}%{_sysconfdir}/issue cat <<-"EOF" > %{buildroot}%{_libdir}/issue.net -Welcome to %{distribution} %{version} (%{_arch}) +Welcome to Microsoft %{distribution} %{version} (%{_arch}) EOF ln -sv ..%{_libdir}/issue.net %{buildroot}%{_sysconfdir}/issue.net @@ -112,6 +113,10 @@ install -Dm0644 %{SOURCE3} -t %{buildroot}%{_userpresetdir}/ %{_userpresetdir}/*.preset %changelog +* Thu Mar 07 2024 Andrew Phelps - 3.0-5 +- Add 'Microsoft' to names in release files and welcome message +- Restore full version number in release files + * Thu Feb 22 2024 Dan Streetman - 3.0-4 - remove %%config(noreplace) from *-release files - define dist_version and use local macros