From 558f68cf6266b82e5ab3807c7e23af0c4f6481bf Mon Sep 17 00:00:00 2001 From: miao_kaibo Date: Sun, 7 Feb 2021 15:27:46 +0800 Subject: [PATCH] change generic_version from 20.03 to 21.03 and delete generic_patch_level --- generic-release.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/generic-release.spec b/generic-release.spec index 7ff41c6..5bf3d0a 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -3,9 +3,8 @@ %define variant_titlecase Server %define variant_lowercase server %define dist_release_version 8 -%define generic_version 20.03 -%define generic_patch_level LTS -%define generic_release 42 +%define generic_version 21.03 +%define generic_release 43 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -14,14 +13,14 @@ %endif Name: %{product_family}-release -Version: %{generic_version}%{generic_patch_level} +Version: %{generic_version} 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} Source0: generic-release-%{builtin_release_version}.tar.gz Source1: 85-display-manager.preset Source2: 90-default.preset @@ -52,16 +51,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}" > $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}" ID="%{product_family}" VERSION_ID="%{generic_version}" -PRETTY_NAME="%{product_family} %{generic_version} (%{generic_patch_level})" +PRETTY_NAME="%{product_family} %{generic_version}" ANSI_COLOR="0;31" EOF @@ -136,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/performance.sh %changelog +* Sun Feb 07 2021 miao_kaibo - 1.0-43 +- change generic_version from 20.03 to 21.03 and delete generic_patch_level + * Sat Dec 26 2020 fu_changjie - 1.0-42 - Use generic_version macro instead of constant value， fix issue I28WC0 -- Gitee