diff --git a/0001-dde-control-center-uos-fix-modify-eulerServerEnduserAgreement_new-path.patch b/0001-dde-control-center-uos-fix-modify-eulerServerEnduserAgreement_new-path.patch new file mode 100644 index 0000000000000000000000000000000000000000..c8d936fdacbeddaa390d8c9be74ae38bc74ab370 --- /dev/null +++ b/0001-dde-control-center-uos-fix-modify-eulerServerEnduserAgreement_new-path.patch @@ -0,0 +1,25 @@ +From 2195d2302d073b10a09f1c9c65c02a6bb3ff16fd Mon Sep 17 00:00:00 2001 +From: liweigang +Date: Thu, 23 Jun 2022 17:22:20 +0800 +Subject: [PATCH] fix: modify eulerServerEnduserAgreement_new path + +--- + src/frame/window/protocolfile.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/frame/window/protocolfile.cpp b/src/frame/window/protocolfile.cpp +index 6cbb461..87f3da2 100644 +--- a/src/frame/window/protocolfile.cpp ++++ b/src/frame/window/protocolfile.cpp +@@ -30,7 +30,7 @@ DCORE_USE_NAMESPACE + + const static QString serverEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Server-CN-%1.txt"; + const static QString serverEnduserAgreement_old = "/usr/share/deepin-deepinid-client/privacy/End-User-License-Agreement-Server/End-User-License-Agreement-Server-CN-%1.txt"; +-const static QString eulerServerEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Server-Euler-%1.txt"; ++const static QString eulerServerEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Server-CN-%1.txt"; + const static QString homeEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Home-CN-%1.txt"; + const static QString homeEnduserAgreement_old = "/usr/share/deepin-deepinid-client/privacy/End-User-License-Agreement-Home/End-User-License-Agreement-Home-CN-%1.txt"; + const static QString professionalEnduserAgreement_new = "/usr/share/protocol/enduser-agreement/End-User-License-Agreement-Professional-CN-%1.txt"; +-- +2.20.1 + diff --git a/dde-control-center-5.4.84.7.tar.gz b/dde-control-center-5.4.84.7.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ecaadec57657b41ef6aa173be5a3d3ab53f1fc86 Binary files /dev/null and b/dde-control-center-5.4.84.7.tar.gz differ diff --git a/dde-control-center.spec b/dde-control-center.spec index c41c4c65d46c735efbd5729e8b0995265d5bac33..ccb7bcde649be83e430b1fb6c5af332217a6ee2f 100644 --- a/dde-control-center.spec +++ b/dde-control-center.spec @@ -1,14 +1,13 @@ -%global release_name server-industry-20200613 - Name: dde-control-center -Version: 5.1.0.19 -Release: 3 +Version: 5.4.84.7 +Release: 1%{?dist}.05 Summary: New control center for Linux Deepin License: GPLv3 -URL: https://uos-packages.deepin.com/uos/pool/main/d/dde-control-center/ -Source0: %{name}_%{version}-%{release_name}.orig.tar.xz -Source1: locale.gen -Source2: locale-gen +URL: https://github.com/linuxdeepin/%{name} +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +#add by uos +Patch0001: 0001-dde-control-center-uos-fix-modify-eulerServerEnduserAgreement_new-path.patch +#end BuildRequires: gcc-c++ BuildRequires: desktop-file-utils @@ -20,20 +19,18 @@ BuildRequires: dde-qt-dbus-factory-devel BuildRequires: pkgconfig(gsettings-qt) BuildRequires: pkgconfig(geoip) BuildRequires: pkgconfig(libnm) -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Multimedia) -BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5Xml) -BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: libpwquality-devel +BuildRequires: qt5-devel BuildRequires: pkgconfig(xcb-ewmh) BuildRequires: kf5-networkmanager-qt-devel BuildRequires: udisks2-qt5-devel BuildRequires: qt5-linguist BuildRequires: cmake BuildRequires: libXext-devel +BuildRequires: gtest-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 @@ -41,64 +38,67 @@ Requires: dde-qt5integration Requires: dde-network-utils Requires: startdde Requires: dde-server-industry-config +Requires: deepin-pw-check +Requires: NetworkManager-l2tp +Requires: cracklib %description New control center for Linux Deepin. %package devel Summary: %{summary} -BuildArch: noarch %description devel %{summary}. %prep -%setup -q -n %{name}-%{version}-%{release_name} +%setup -q -n %{name}-%{version} +%patch0001 -p1 sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh -sed -i '/%{name}/s|\.\./lib|%{_libdir}|' src/frame/pluginscontroller.cpp sed -i -E '/add_compile_definitions/d' CMakeLists.txt +patch com.deepin.dde.control-center.gschema.xml < rpm/com.deepin.dde.control-center.gschema.xml.patch %build %cmake . -DDCC_DISABLE_GRUB=YES \ + -DCVERSION=%{version} \ -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 -mkdir -p %{buildroot}/usr/lib64/cmake/DdeControlCenter -mv %{buildroot}/cmake/DdeControlCenter/DdeControlCenterConfig.cmake %{buildroot}/usr/lib64/cmake/DdeControlCenter +# 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}%{_libdir}/cmake/DdeControlCenter +mv %{buildroot}/cmake/DdeControlCenter/DdeControlCenterConfig.cmake %{buildroot}%{_libdir}/cmake/DdeControlCenter +%ifnarch %{ix86} mv %{buildroot}/usr/lib/libdccwidgets.so %{buildroot}%{_libdir}/ +%endif install -Dm644 com.deepin.controlcenter.addomain.policy %{buildroot}%{_datadir}/polkit-1/actions/ -install -Dm644 %{_sourcedir}/locale.gen %{buildroot}%{_sysconfdir}/locale.gen -install -Dm755 %{_sourcedir}/locale-gen %{buildroot}/sbin/locale-gen %check desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %ldconfig_scriptlets -%post -if [ $1 -ge 1 ]; then - mkdir -p /etc/profile.d - echo '[ -f $HOME/.config/locale.conf ] && source $HOME/.config/locale.conf > /dev/null 2>&1 || return 0' > /etc/profile.d/dde.sh - chmod 644 /etc/profile.d/dde.sh -fi - -%postun -if [ $1 -eq 0 ]; then - rm -f /etc/profile.d/dde.sh -fi - %files %doc README.md %license LICENSE %{_sysconfdir}/ %{_bindir}/abrecovery %{_bindir}/dde-control-center +%{_bindir}/dde-control-center-wapper %{_datadir}/ -/bin/restore-tool -/sbin/locale-gen %{_libdir}/libdccwidgets.so /etc/xdg/autostart/deepin-ab-recovery.desktop @@ -107,14 +107,13 @@ fi %{_libdir}/cmake/DdeControlCenter/ %changelog -* Fri Sep 4 2020 chenbo pan 5.1.0.19-3 -- fix compile fail +* Fri Jun 24 2022 Lujun - 5.4.84.7-1.05 +- fix: sync password dictionary(bugid:142197) + +* Thu Jun 23 2022 liweiganga - 5.4.84.7-1.03 +- fix: fix E control center not display User license protocol -* Fri Jul 3 2020 uniontech - 5.1.0.19-2 -- Add dde.sh to profile.d +* Mon Jun 13 2022 uoser - 5.4.84.7-1.02 +- Update to 5.4.84.7 -* Mon Jun 15 2020 uniontech - 5.1.0.19 -- Remove the universal menu. -* Fri May 29 2020 uniontech - 5.0.30 -- Project init.