From a6c0fdf0c667d96ddf65cbe39b2e0a933c2ca624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alwill=20Xiao=28=E8=82=96=E4=BC=A0=E6=A5=A0=29?= Date: Mon, 24 Jun 2024 14:02:19 +0800 Subject: [PATCH] Simplified modification of generic_patch_level and generic_patch_level_extend --- generic-release.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/generic-release.spec b/generic-release.spec index f5fc2ab..c616581 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -6,7 +6,7 @@ %define generic_version 22.03 %define generic_patch_level LTS %define generic_patch_level_extend SP3 -%define generic_release 57 +%define generic_release 58 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -15,14 +15,14 @@ %endif Name: %{product_family}-release -Version: %{generic_version}%{generic_patch_level}_%{generic_patch_level_extend} +Version: %{generic_version}%{?generic_patch_level:%{generic_patch_level}%{?generic_patch_level_extend:_%{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}_%{generic_patch_level_extend} +Provides: system-release = %{generic_version}%{?generic_patch_level:%{generic_patch_level}%{?generic_patch_level_extend:_%{generic_patch_level_extend}}} Source0: generic-release-%{builtin_release_version}.tar.gz Source1: 85-display-manager.preset Source2: 90-default.preset @@ -44,16 +44,16 @@ echo OK %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc -echo "%{product_family} release %{generic_version} (%{generic_patch_level}-%{generic_patch_level_extend})" > $RPM_BUILD_ROOT/etc/%{product_family}-release +echo "%{product_family} release %{generic_version}%{?generic_patch_level: (%{generic_patch_level}%{?generic_patch_level_extend:-%{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}-%{generic_patch_level_extend})" +VERSION="%{generic_version}%{?generic_patch_level: (%{generic_patch_level}%{?generic_patch_level_extend:-%{generic_patch_level_extend}})}" ID="%{product_family}" VERSION_ID="%{generic_version}" -PRETTY_NAME="%{product_family} %{generic_version} (%{generic_patch_level}-%{generic_patch_level_extend})" +PRETTY_NAME="%{product_family} %{generic_version}%{?generic_patch_level: (%{generic_patch_level}%{?generic_patch_level_extend:-%{generic_patch_level_extend}})}" ANSI_COLOR="0;31" EOF @@ -127,6 +127,9 @@ fi /usr/share/eula/eula.* %changelog +* Mon Jun 24 2024 xiaochn - 1.0-58 +- Simplified modification of generic_patch_level and generic_patch_level_extend + * Mon May 20 2024 liyanan - 1.0-57 - Delete Processes print -- Gitee