diff --git a/generic-release.spec b/generic-release.spec index 83af29ab82a8e12f21a603e1a790a2d09c14482b..c94ce99e34cf7fba68a18f25d876ed01aa11efc1 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -5,7 +5,8 @@ %define dist_release_version 8 %define generic_version 20.03 %define generic_patch_level LTS -%define generic_release 37 +%define generic_patch_level_extend SP1 +%define generic_release 38 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -14,14 +15,14 @@ %endif Name: %{product_family}-release -Version: %{generic_version}%{generic_patch_level} +Version: %{generic_version}%{generic_patch_level}_%{generic_patch_level_extend} Release: %{generic_release} Summary: %{product_family} release file License: Mulan PSL v2 Provides: %{product_family}-release Provides: %{_vendor}-release Provides: generic-release -Provides: system-release = %{generic_version}%{generic_patch_level} +Provides: system-release = %{generic_version}%{generic_patch_level}_%{generic_patch_level_extend} Source0: generic-release-%{builtin_release_version}.tar.gz Source1: 85-display-manager.preset Source2: 90-default.preset @@ -52,16 +53,16 @@ echo OK %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc -echo "%{product_family} release %{generic_version} (%{generic_patch_level})" > $RPM_BUILD_ROOT/etc/%{product_family}-release +echo "%{product_family} release %{generic_version} (%{generic_patch_level}-%{generic_patch_level_extend})" > $RPM_BUILD_ROOT/etc/%{product_family}-release ln -sf %{product_family}-release $RPM_BUILD_ROOT/etc/system-release # create /etc/os-release cat << EOF >>$RPM_BUILD_ROOT/etc/os-release NAME="%{product_family}" -VERSION="%{generic_version} (%{generic_patch_level})" +VERSION="%{generic_version} (%{generic_patch_level}-%{generic_patch_level_extend})" ID="%{product_family}" VERSION_ID="%{generic_version}" -PRETTY_NAME="%{product_family} %{generic_version} (%{generic_patch_level})" +PRETTY_NAME="%{product_family} %{generic_version} (%{generic_patch_level}-%{generic_patch_level_extend})" ANSI_COLOR="0;31" EOF @@ -136,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/performance.sh %changelog +* Mon Nov 25 2020 miao_kaibo - 1.0-38 +- change generic_patch_level and generic_release + * Mon May 18 2020 shenyangyang - 1.0-37 - add equal sign in color.sh