diff --git a/0001-fix-file-os-version-on-all-arch.patch b/0001-fix-file-os-version-on-all-arch.patch new file mode 100644 index 0000000000000000000000000000000000000000..2a3c4bd21f9e0671afe98e183608587ad2f10b8a --- /dev/null +++ b/0001-fix-file-os-version-on-all-arch.patch @@ -0,0 +1,107 @@ +From 52b54017f0d399055f9aa3bc71fc4a05009a3751 Mon Sep 17 00:00:00 2001 +From: yangxianzhao +Date: Wed, 13 Dec 2023 17:31:13 +0800 +Subject: [PATCH] fix file os-version on all arch + +--- + files/os-version-amd64-E | 16 ++++++++-------- + files/os-version-arm64-E | 16 ++++++++-------- + files/os-version-mips4-E | 16 ++++++++-------- + files/os-version-sw64-E | 16 ++++++++-------- + 4 files changed, 32 insertions(+), 32 deletions(-) + +diff --git a/files/os-version-amd64-E b/files/os-version-amd64-E +index 93fd28f..bd66cd9 100644 +--- a/files/os-version-amd64-E ++++ b/files/os-version-amd64-E +@@ -1,10 +1,10 @@ + [Version] +-SystemName=UnionTech OS Server +-SystemName[zh_CN]=统信服务器操作系统 +-ProductType=Server +-ProductType[zh_CN]=服务器 +-EditionName=e +-EditionName[zh_CN]=e ++SystemName=Deepin ++SystemName[zh_CN]=深度操作系统 ++ProductType=Desktop ++ProductType[zh_CN]=桌面 ++EditionName=Community ++EditionName[zh_CN]=社区版 + MajorVersion=20 +-MinorVersion=1050 +-OsBuild=12038.102 ++MinorVersion=20.8 ++OsBuild=11038.007 +diff --git a/files/os-version-arm64-E b/files/os-version-arm64-E +index 5df2b05..bd66cd9 100644 +--- a/files/os-version-arm64-E ++++ b/files/os-version-arm64-E +@@ -1,10 +1,10 @@ + [Version] +-SystemName=UnionTech OS Server +-SystemName[zh_CN]=统信服务器操作系统 +-ProductType=Server +-ProductType[zh_CN]=服务器 +-EditionName=e +-EditionName[zh_CN]=e ++SystemName=Deepin ++SystemName[zh_CN]=深度操作系统 ++ProductType=Desktop ++ProductType[zh_CN]=桌面 ++EditionName=Community ++EditionName[zh_CN]=社区版 + MajorVersion=20 +-MinorVersion=1050 +-OsBuild=12034.102 ++MinorVersion=20.8 ++OsBuild=11038.007 +diff --git a/files/os-version-mips4-E b/files/os-version-mips4-E +index 5df2b05..bd66cd9 100644 +--- a/files/os-version-mips4-E ++++ b/files/os-version-mips4-E +@@ -1,10 +1,10 @@ + [Version] +-SystemName=UnionTech OS Server +-SystemName[zh_CN]=统信服务器操作系统 +-ProductType=Server +-ProductType[zh_CN]=服务器 +-EditionName=e +-EditionName[zh_CN]=e ++SystemName=Deepin ++SystemName[zh_CN]=深度操作系统 ++ProductType=Desktop ++ProductType[zh_CN]=桌面 ++EditionName=Community ++EditionName[zh_CN]=社区版 + MajorVersion=20 +-MinorVersion=1050 +-OsBuild=12034.102 ++MinorVersion=20.8 ++OsBuild=11038.007 +diff --git a/files/os-version-sw64-E b/files/os-version-sw64-E +index 5df2b05..bd66cd9 100644 +--- a/files/os-version-sw64-E ++++ b/files/os-version-sw64-E +@@ -1,10 +1,10 @@ + [Version] +-SystemName=UnionTech OS Server +-SystemName[zh_CN]=统信服务器操作系统 +-ProductType=Server +-ProductType[zh_CN]=服务器 +-EditionName=e +-EditionName[zh_CN]=e ++SystemName=Deepin ++SystemName[zh_CN]=深度操作系统 ++ProductType=Desktop ++ProductType[zh_CN]=桌面 ++EditionName=Community ++EditionName[zh_CN]=社区版 + MajorVersion=20 +-MinorVersion=1050 +-OsBuild=12034.102 ++MinorVersion=20.8 ++OsBuild=11038.007 +-- +2.31.1 + diff --git a/deepin-desktop-base.spec b/deepin-desktop-base.spec index 6c342a509239a595f6741a41d940e75be7c418c4..5a971529d0dae052e3f4adbd6a0bb394957ad8de 100644 --- a/deepin-desktop-base.spec +++ b/deepin-desktop-base.spec @@ -2,7 +2,7 @@ Name: deepin-desktop-base Version: 2022.01.27 -Release: 5 +Release: 6 Summary: Base files for Deepin Desktop License: GPLv3 URL: https://github.com/linuxdeepin/deepin-desktop-base @@ -12,6 +12,7 @@ Source1: dde.conf Patch1: 0001-fix-unified-use-desktop-version-server.in.patch Patch2: 0002-adapt-E.patch Patch3: 0001-fix-logo.patch +Patch4: 0001-fix-file-os-version-on-all-arch.patch %description %{summary}. @@ -38,6 +39,7 @@ Obsoletes: license-config < 0.0.4-3 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build # Remove Deepin lsb-release @@ -85,6 +87,9 @@ install -Dm644 files/os-license %{buildroot}/%{_sysconfdir}/.uos/os-license %{_sysconfdir}/os-version %changelog +* Wed Dec 13 2023 yangxianzhao - 2022.01.27-6 +- fix file os-version on all arch + * Tue Dec 12 2023 liuzhilin - 2022.01.27-5 - fix logo