From 33bc05571e00d0a875253ffe66ff3d18a6248942 Mon Sep 17 00:00:00 2001 From: liuzhilin Date: Wed, 10 Apr 2024 17:34:18 +0800 Subject: [PATCH 1/2] fix dde-network-core build error --- dde-control-center.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dde-control-center.spec b/dde-control-center.spec index c2bfdf0..752e487 100644 --- a/dde-control-center.spec +++ b/dde-control-center.spec @@ -1,8 +1,6 @@ -%define specrelease 3 - Name: dde-control-center Version: 5.5.182 -Release: %{specrelease} +Release: 4 Summary: New control center for Linux Deepin License: GPLv3 URL: https://github.com/linuxdeepin/dde-control-center @@ -37,8 +35,8 @@ Patch0011: 0010-fix-Array-out-of-bounds-causes-crash-handling.patch BuildRequires: gcc-c++ BuildRequires: desktop-file-utils -BuildRequires: dde-dock-devel -BuildRequires: dde-network-core-devel +#BuildRequires: dde-dock-devel +#BuildRequires: dde-network-core-devel #BuildRequires: dde-network-utils-devel BuildRequires: dtkwidget-devel BuildRequires: dtkgui-devel @@ -74,10 +72,10 @@ BuildRequires: qt5-qtbase-private-devel Requires: dde-account-faces Requires: dde-api -Requires: dde-daemon +#Requires: dde-daemon Requires: dde-qt5integration -Requires: dde-network-core -Requires: startdde +#Requires: dde-network-core +#Requires: startdde Requires: dde-server-industry-config Requires: deepin-pw-check Requires: cracklib @@ -160,6 +158,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %{_libdir}/cmake/DdeControlCenter/ %changelog +* Wed Apr 10 2024 liuzhilin - 5.5.182-4 +- fix dde-network-core build error + * Thu Jan 25 2024 lvgenggeng - 5.5.182-3 - fix URL error -- Gitee From 4d74f78c7e0fa8edb6f8ea2baf4aae2120b4f03c Mon Sep 17 00:00:00 2001 From: liuzhilin Date: Fri, 12 Apr 2024 17:57:25 +0800 Subject: [PATCH 2/2] backport del buildrequires --- dde-control-center.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dde-control-center.spec b/dde-control-center.spec index 752e487..0a2051e 100644 --- a/dde-control-center.spec +++ b/dde-control-center.spec @@ -1,6 +1,6 @@ Name: dde-control-center Version: 5.5.182 -Release: 4 +Release: 5 Summary: New control center for Linux Deepin License: GPLv3 URL: https://github.com/linuxdeepin/dde-control-center @@ -35,8 +35,8 @@ Patch0011: 0010-fix-Array-out-of-bounds-causes-crash-handling.patch BuildRequires: gcc-c++ BuildRequires: desktop-file-utils -#BuildRequires: dde-dock-devel -#BuildRequires: dde-network-core-devel +BuildRequires: dde-dock-devel +BuildRequires: dde-network-core-devel #BuildRequires: dde-network-utils-devel BuildRequires: dtkwidget-devel BuildRequires: dtkgui-devel @@ -72,10 +72,10 @@ BuildRequires: qt5-qtbase-private-devel Requires: dde-account-faces Requires: dde-api -#Requires: dde-daemon +Requires: dde-daemon Requires: dde-qt5integration -#Requires: dde-network-core -#Requires: startdde +Requires: dde-network-core +Requires: startdde Requires: dde-server-industry-config Requires: deepin-pw-check Requires: cracklib @@ -158,6 +158,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %{_libdir}/cmake/DdeControlCenter/ %changelog +* Fri Apr 12 2024 liuzhilin - 5.5.182-5 +- backport del buildrequires + * Wed Apr 10 2024 liuzhilin - 5.5.182-4 - fix dde-network-core build error -- Gitee