From f7c076d13602cc3daf27bcd6a095423078b8a8fe Mon Sep 17 00:00:00 2001 From: xiaochuannan Date: Thu, 7 Aug 2025 10:58:48 +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 aaf2930..7475556 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -4,7 +4,7 @@ %define variant_lowercase server %define dist_release_version 8 %define generic_version 25.09 -%define generic_release 56 +%define generic_release 57 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -13,14 +13,14 @@ %endif Name: %{product_family}-release -Version: %{generic_version} +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} +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 @@ -42,16 +42,16 @@ echo OK %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc -echo "%{product_family} release %{generic_version}" > $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}" +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}" +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 @@ -125,6 +125,9 @@ fi /usr/share/eula/eula.* %changelog +* Thu Aug 07 2025 xiaochn - 1.0-57 +- Simplified modification of generic_patch_level and generic_patch_level_extend + * Mon Jul 28 2025 yangchaohao - 1.0-56 - modify generic_patch_level_extend -- Gitee