diff --git a/dde-control-center-5.3.0.54.4.tar.gz b/dde-control-center-5.4.43.27.tar.gz similarity index 96% rename from dde-control-center-5.3.0.54.4.tar.gz rename to dde-control-center-5.4.43.27.tar.gz index 02c46493f8b454c122088e357f85435163f2a33e..2576590359829f325116b514a723c12e28b4cfec 100644 Binary files a/dde-control-center-5.3.0.54.4.tar.gz and b/dde-control-center-5.4.43.27.tar.gz differ diff --git a/dde-control-center.spec b/dde-control-center.spec index d8b171d118bf9970f998c2f4ca5dc2c6bfa20138..0ad0172d96b61919841bbb4bf393b34b78c032dd 100644 --- a/dde-control-center.spec +++ b/dde-control-center.spec @@ -1,11 +1,15 @@ +%define specrelease 1%{?dist} +%if 0%{?openeuler} +%define specrelease 1 +%endif + Name: dde-control-center -Version: 5.3.0.54.4 -Release: 2 +Version: 5.4.43.27 +Release: %{specrelease} Summary: New control center for Linux Deepin License: GPLv3 URL: https://github.com/linuxdeepin/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: modify-QPainterPath-error.patch BuildRequires: gcc-c++ BuildRequires: desktop-file-utils @@ -26,6 +30,11 @@ BuildRequires: qt5-linguist BuildRequires: cmake BuildRequires: libXext-devel BuildRequires: qt5-qtbase-private-devel +BuildRequires: gtest-devel +BuildRequires: gmock-devel +BuildRequires: polkit-qt5-1-devel +BuildRequires: deepin-pw-check +BuildRequires: deepin-pw-check-devel Requires: dde-account-faces Requires: dde-api Requires: dde-daemon @@ -33,20 +42,21 @@ Requires: dde-qt5integration Requires: dde-network-utils Requires: startdde Requires: dde-server-industry-config +Requires: deepin-pw-check +Requires: cracklib +Recommends: NetworkManager-l2tp %description New control center for Linux Deepin. %package devel Summary: %{summary} -BuildArch: noarch %description devel %{summary}. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh sed -i -E '/add_compile_definitions/d' CMakeLists.txt @@ -55,9 +65,21 @@ sed -i -E '/add_compile_definitions/d' CMakeLists.txt -DDISABLE_SYS_UPDATE=YES %make_build +%post +create-cracklib-dict /usr/share/dict/MainEnglishDictionary_ProbWL.txt + +%postun +if [ "$1" = "0" ] ; then + create-cracklib-dict /usr/share/dict/MainEnglishDictionary_ProbWL.txt +fi + %install %make_install INSTALL_ROOT=%{buildroot} +# place holder plugins dir mkdir -p %{buildroot}%{_libdir}/%{name}/plugins +# https://github.com/linuxdeepin/dde-control-center/issues/115 +# And we disabled SYS_UPDATE, so reboot-reminder-dialog is useless. +#rm %{buildroot}%{_bindir}/reboot-reminder-dialog mkdir -p %{buildroot}/usr/lib64/cmake/DdeControlCenter mv %{buildroot}/cmake/DdeControlCenter/DdeControlCenterConfig.cmake %{buildroot}/usr/lib64/cmake/DdeControlCenter mv %{buildroot}/usr/lib/libdccwidgets.so %{buildroot}%{_libdir}/ @@ -74,6 +96,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %{_sysconfdir}/ %{_bindir}/abrecovery %{_bindir}/dde-control-center +%{_bindir}/dde-control-center-wapper %{_datadir}/ %{_libdir}/libdccwidgets.so /etc/xdg/autostart/deepin-ab-recovery.desktop @@ -83,6 +106,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %{_libdir}/cmake/DdeControlCenter/ %changelog +* Mon Jul 18 2022 konglidong - 5.4.43.27-1 +- Update to 5.4.43.27 + * Sun Jan 30 2022 liweigang - 5.3.0.54.4-2 - fix build error @@ -100,3 +126,4 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: * Fri May 29 2020 uniontech - 5.0.30 - Project init. + diff --git a/modify-QPainterPath-error.patch b/modify-QPainterPath-error.patch deleted file mode 100644 index 6eaaf3880b0c39b9c136b46b53e4213a131d04f1..0000000000000000000000000000000000000000 --- a/modify-QPainterPath-error.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --color -Naur a/src/frame/modules/display/recognizedialog.cpp b/src/frame/modules/display/recognizedialog.cpp ---- a/src/frame/modules/display/recognizedialog.cpp 2022-02-07 09:13:05.486670717 +0800 -+++ b/src/frame/modules/display/recognizedialog.cpp 2022-02-07 09:13:59.994251626 +0800 -@@ -28,6 +28,7 @@ - - #include - #include -+#include - - using namespace dcc::display; -