diff --git a/0004-modify-log-content.patch b/0004-modify-log-content.patch new file mode 100644 index 0000000000000000000000000000000000000000..1fdcc76be3ec542e8650b24bcb2f557f4811fd81 --- /dev/null +++ b/0004-modify-log-content.patch @@ -0,0 +1,25 @@ +From 66c139eaf528b7bf452f2a4c0892e2d6a4f0a46c Mon Sep 17 00:00:00 2001 +From: zhangshaoning +Date: Wed, 10 Sep 2025 16:38:05 +0800 +Subject: [PATCH] modify log content + +--- + display/xorg.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/display/xorg.go b/display/xorg.go +index 1ecdb7a..472a9bf 100644 +--- a/display/xorg.go ++++ b/display/xorg.go +@@ -533,7 +533,7 @@ func (mm *xMonitorManager) refreshMonitorsCache() { + if monitor.Connected { + stdName, err = mm.getStdMonitorName(monitor.Name, monitor.EDID) + if err != nil { +- logger.Warningf("get monitor %v std name failed: %v", monitor.Name, err) ++ logger.Warningf("get monitor %v std name: %v", monitor.Name, err) + } + } + +-- +2.18.2 + diff --git a/0004-correct-file-path.patch b/0005-correct-file-path.patch similarity index 100% rename from 0004-correct-file-path.patch rename to 0005-correct-file-path.patch diff --git a/startdde.spec b/startdde.spec index 61e2bb63a7fd7a7105d9f656488d687f6aa0d198..f5b530a28ef2b0ff0fcad956c2e75c1a9e1def1b 100644 --- a/startdde.spec +++ b/startdde.spec @@ -1,13 +1,13 @@ %global _missing_build_ids_terminate_build 0 %global debug_package %{nil} -%define specrelease 2 +%define specrelease 4 Name: startdde Version: 5.9.61 Release: %{specrelease} Summary: Starter of deepin desktop environment -License: GPLv3 +License: GPLv3+ URL: https://github.com/linuxdeepin/startdde Source0: %{name}-%{version}.tar.gz Source1: vendor.tar.gz @@ -15,7 +15,8 @@ Source1: vendor.tar.gz Patch1: 0001-uos-startdde-fix-kvm-gpu-message-pci-error.patch Patch2: 0002-uos-startdde-rm-redshift.patch Patch3: 0003-uos-startdde-rm-message-greeter-BadMatch-error.patch -Patch4: 0004-correct-file-path.patch +Patch4: 0004-modify-log-content.patch +Patch5: 0005-correct-file-path.patch BuildRequires: golang BuildRequires: jq @@ -55,6 +56,7 @@ patch main.go < rpm/main.go.patch %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 tar -xf %{SOURCE1} @@ -106,6 +108,12 @@ fi %{_datadir}/dsg/configs/org.deepin.startdde/ %changelog +* Thu Sep 25 2025 wangqia - 5.9.61-4 +- spec: update license + +* Wed Sep 10 2025 zhangshaoning - 5.9.61-3 +- modify log content + * Fri Sep 05 2025 kkz - 5.9.61-2 - fix some exec file path