From 40df9cad53edc9f1f3c65b18465b38c9c407ffba Mon Sep 17 00:00:00 2001
From: leeffo <liweiganga@uniontech.com>
Date: Wed, 2 Aug 2023 16:23:03 +0800
Subject: [PATCH] upgrade to version 2022.1.4

---
 dde-2021.06.30.tar.gz => dde-2022.1.4.tar.gz | Bin 30720 -> 30720 bytes
 dde.spec                                     | 241 ++++++++-----------
 2 files changed, 105 insertions(+), 136 deletions(-)
 rename dde-2021.06.30.tar.gz => dde-2022.1.4.tar.gz (91%)

diff --git a/dde-2021.06.30.tar.gz b/dde-2022.1.4.tar.gz
similarity index 91%
rename from dde-2021.06.30.tar.gz
rename to dde-2022.1.4.tar.gz
index 05e417c2716a620e9ae2beab5614d099e076ea97..e6b8fd5c275c8dedf02ea9b25e4b1c1c156dcace 100644
GIT binary patch
delta 717
zcmZvazfQtH9LIYVjz|O(kcH_;@XrGDdVgw+gU`^IVq6qx)gpfdHe(oB9PkF?;Glyq
z(8usSoQW@>C!xg)bi97@`TqWmXJ9-7DcAK%reT_8T&9)jTXpL0WidAlN;u(~flW%8
zhM2&>4FG^3J|{(5cc%3Ng(RF?>&TcR>M<3ij2Id+R-{m(P(>LhI6@OJ9_DYY<TJcJ
zKP{zcRmzFQBk4BW2&EZ`W>i#GD*IoQnuVzlMG{3SN-ahsw6L@mC0bNb#+VtQyRZ^k
zPZwQL%QCo}k%5WH<fvBX??|bmN-6)BUxk~Y^ioO-dB%vTVT$?EO}VvPL+u#s%y*l#
zy_Q!Sct=Qn7zw-n6`VEpLGbK;gPiU4NB*5R`1|V)ZyViqyW0_yt4VNvZ3BUPC_ZoQ
z#f6_2FaD!A@e`uc%muH_LlEe#2OZ5bN;p|Uqn=wEdT7{1;Q`9$q&$j`Cp{4s-;;gz
S)IN!2%0pYMr2hlo2l_87?5F|&

delta 924
zcmZ{jJ#W)M9EWph>Zl>Kw4q3pfkO=pNKVe@Hwhs&Muvh23j-#1v5zFSxj4!i@glKM
zHJrr805h8rLh4ZQIY3NcF);KSz$G$v6M{FNA3gW;?|(Nw2IFI}K?qeb!de4a4IMQn
zZ|_dXl^U{agbmZy3P{72rWc?oG(chi6i`lCQ7yI>Sp(_ja<<eGq%<!!EZZtTv_z~(
zSeb`S+qN^ftgPlKs{f=g_5Y<<m*Vw#v1J-YCf-n1a`Bdgx8`BfFl85M<eG9ihoOYw
z0<2-2!Iw^&>k_Unz&1u1d|7E$|4xL5{pMtIFKgPw`gAI~ta^FVEh%p;$kB-;_ms6f
z_5)eo#T^UF4m4vn_0(_5`Db~Y>tH+0Q@Krh)EUrgP(E1fJxppn=6Vt7t8Ua)T~294
zd3?2PfO5!bFK|eFi>wqYySotnc>eMG;cKCJXT`G)6WFU+oxqROzT-PC<ufLE|L*6}
zK7?|k$3w>HV7k-vlrlf!0U5R<7Wnb6&K+<{E{0q#Qx2u`phUPcn#n(VJFBcOmExOs
zL45IE)&lM}2&EzO8zdO{(^%r5b8d~WL3g(M^i2e8Tio!<O32z>`4b~{6I7F<aq{6X
z*?*C|c`Clr^QAuXS^VkIlVUxsM8y>q4nyKZ6h;BeZ<G8`i8s&O2d|3dymDX8$Df~%
Ofoyqg(qk3;R{j8^7W1h9

diff --git a/dde.spec b/dde.spec
index 82e3478..c052e83 100644
--- a/dde.spec
+++ b/dde.spec
@@ -1,134 +1,101 @@
-%global debug_package   %{nil}
-
-Name:           dde
-Version:        2021.06.30
-Release:        6
-Summary:        Deepin New Desktop Environment - Next
-License:        GPLv3
-URL:            https://uos-packages.deepin.com/uos/pool/main/d/dde/
-Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-
-BuildRequires:  shadow
-Requires:       systemd-pam
-Requires:       lightdm
-#Requires:       lightdm-gtk-greeter
-Requires:       plymouth
-Requires:       mesa-dri-drivers
-Requires:       xorg-x11-server
-Requires:       librsvg2-tools
-Requires:       dde-api
-Requires:       dde-kwin
-Requires:       dde-dock
-Requires:       deepin-default-settings
-Requires:       dde-daemon
-Requires:       dde-desktop
-Requires:       dde-launcher
-Requires:       dde-calendar
-Requires:       dde-clipboard
-Requires:       startdde
-Requires:       dde-polkit-agent
-Requires:       dde-file-manager
-Requires:       dde-account-faces
-Requires:       dde-network-utils
-Requires:       dde-control-center
-Requires:       libdde-file-manager
-Requires:       dde-session-shell
-Requires:       dde-session-ui
-Requires:       dde-qt5integration
-Requires:       dde-qt-dbus-factory
-Requires:       dde-disk-mount-plugin
-Requires:       dde-dock-onboard-plugin
-Requires:       deepin-anything-libs
-#Requires:       deepin-qml-widgets
-Requires:       deepin-menu
-Requires:       deepin-desktop-base
-Requires:       deepin-icon-theme
-Requires:       deepin-default-settings
-Requires:       deepin-desktop-schemas
-Requires:       deepin-system-monitor
-Requires:       qt5dxcb-plugin
-Requires:       dde-network-utils
-Requires:       deepin-wallpapers
-Requires:       deepin-gtk-theme
-Requires:       deepin-anything-server
-Requires:       deepin-anything-dkms
-Requires:       dde-device-formatter
-Requires:       deepin-icon-theme
-Requires:       deepin-turbo
-#Requires:       deepin-clone
-Requires:       deepin-dbus-generator
-Requires:       deepin-gettext-tools
-Requires:       deepin-editor
-Requires:       deepin-font-manager
-Requires:       deepin-reader
-Requires:       gnome-keyring
-Requires:       passwd
-Requires:       dtkcore
-Requires:       dtkgui
-Requires:       dtkwidget
-Requires:       deepin-draw
-Requires:       deepin-screen-recorder
-Requires:       deepin-pw-check
-
-Recommends:     gnu-free-fonts-common
-Recommends:     sil-padauk-fonts
-Recommends:     urw-base35-c059-fonts
-Recommends:     urw-base35-z003-fonts
-Recommends:     google-noto-cjk-fonts
-Recommends:     paratype-pt-sans-fonts
-Recommends:     urw-base35-nimbus-sans-fonts
-Recommends:     fonts-filesystem
-Recommends:     google-noto-emoji-fonts
-Recommends:     google-noto-serif-cjk-ttc-fonts
-Recommends:     gnu-free-serif-fonts
-Recommends:     sil-abyssinica-fonts
-Recommends:     jomolhari-fonts
-Recommends:     urw-base35-gothic-fonts
-Recommends:     urw-base35-p052-fonts
-Recommends:     google-noto-sans-cjk-ttc-fonts
-Recommends:     gnu-free-sans-fonts
-Recommends:     sil-nuosu-fonts
-Recommends:     julietaula-montserrat-fonts
-Recommends:     urw-base35-fonts-common
-Recommends:     urw-base35-bookman-fonts
-Recommends:     urw-base35-nimbus-mono-ps-fonts
-Recommends:     urw-base35-standard-symbols-ps-fonts
-Recommends:     google-droid-sans-fonts
-Recommends:     gnu-free-mono-fonts
-Recommends:     paktype-naskh-basic-fonts
-Recommends:     urw-base35-nimbus-roman-fonts
-Recommends:     abattis-cantarell-fonts
-Recommends:     stix-fonts
-Recommends:     urw-base35-d050000l-fonts
-Recommends:     navilu-fonts
-Recommends:     dejavu-fonts
-Recommends:     khmeros-fonts
-Recommends:     lohit-telugu-fonts
-Recommends:     deepin-image-viewer
-Recommends:     deepin-shortcut-viewer
-Recommends:     deepin-calendar
-Recommends:     deepin-sound-theme
-Recommends:     deepin-terminal
-Recommends:     deepin-keyring
-Recommends:     blur-effect
-Recommends:     deepin-ab-recovery
-Recommends:     deepin-compressor
-Recommends:     deepin-devicemanager
-Recommends:     deepin-elf-verify
-Recommends:     deepin-graphics-driver-manager
-Recommends:     deepin-log-viewer
-Recommends:     libpam-deepin-security
-Recommends:     deepin-manual 
-Recommends:     dde-introduction
-Recommends:     deepin-calculator
-Recommends:     deepin-screenshot
-Recommends:     deepin-picker
-Recommends:     firefox
-Recommends:     gparted
-Recommends:     onboard
-Recommends:     glibc-all-langpacks
-Recommends:     langpacks-zh_CN
-Recommends:     fcitx fcitx-qt5 fcitx-pinyin fcitx-sunpinyin fcitx-configtool fcitx-table-chinese
+%global     debug_package %{nil}
+
+Name:       dde
+Version:    2022.1.4
+Release:    1
+Summary:    Deepin New Desktop Environment - Next
+License:    GPLv3
+URL:        https://github.com/linuxdeepin/dde
+
+Source0:    %{name}-%{version}.tar.gz
+
+## 底层组件
+Requires:   lightdm
+Requires:   mesa-dri-drivers
+Requires:   xorg-x11-server-Xorg
+Requires:   librsvg2-tools
+## DDE
+Requires:   dde-control-center
+Requires:   dde-daemon
+Requires:   dde-dock
+Requires:   dde-dock-onboard-plugin
+Requires:   dde-launcher
+#Requires:   dde-network-utils
+Requires:   dde-network-core
+Requires:   dde-polkit-agent
+Requires:   dde-qt-dbus-factory
+Requires:   dde-server-industry-config
+Requires:   dde-session-shell
+Requires:   dde-session-ui
+Requires:   dde-account-faces
+Requires:   deepin-default-settings
+Requires:   deepin-desktop-schemas
+Requires:   deepin-gettext-tools
+Requires:   deepin-menu
+Requires:   dtkcore
+Requires:   dtkgui
+Requires:   dtkwidget
+Requires:   dde-qt5integration
+Requires:   startdde
+#Requires:   uos-license-content
+Requires:   dde-qt5xcb-plugin
+Requires:   dde-api
+#Requires:   dpa-ext-gnomekeyring
+Requires:   dtkcommon
+Requires:   dde-dconfig-daemon
+##  其他
+Requires:   deepin-desktop-server
+Requires:   deepin-icon-theme
+Requires:   deepin-gtk-theme
+Requires:   deepin-sound-theme
+##  文管
+Requires:   dde-desktop
+Requires:   dde-file-manager
+Requires:   dde-disk-mount-plugin
+Requires:   deepin-wallpapers
+Requires:   deepin-shortcut-viewer
+
+##  窗管
+Requires:   dde-kwin
+##  应用
+Requires:   deepin-system-monitor
+Requires:   dde-calendar
+Requires:   dde-clipboard
+Requires:   dde-device-formatter
+#Requires:   deepin-calculator
+Requires:   deepin-compressor
+Requires:   deepin-devicemanager
+Requires:   deepin-editor
+Requires:   deepin-log-viewer
+%ifnarch loongarch64
+Requires:   deepin-manual
+%endif
+Requires:   deepin-reader
+Requires:   deepin-screen-recorder
+Requires:   deepin-screensaver
+Requires:   deepin-terminal
+#Requires:   org.deepin.browser
+Requires:   gparted
+#Requires:   deepin-boot-maker
+##  输入法
+Requires:   fcitx
+Requires:   fcitx-qt5
+Recommends:   fcitx-pinyin
+Requires:   fcitx-configtool
+Recommends:   fcitx-table-chinese
+Recommends:   deepin-fcitxconfigtool-plugin
+Requires:   fcitx-sunpinyin
+Requires:   fcitx-cloudpinyin
+## 需求
+# support exfat
+#Requires:   exfat-utils
+#Requires:   fuse-exfat
+##  bugfix
+##  fix messages error
+Requires:   gnome-keyring
+##  fix translation error
+Requires:   qt5-qttranslations
+Requires:   deepin-pw-check
 
 %description
 Deepin New Desktop Environment.
@@ -145,17 +112,19 @@ mkdir -p %{buildroot}/etc/{rsyslog.d,logrotate.d}
 install -Dm644 rpm/dde.conf %{buildroot}/etc/rsyslog.d/dde.conf
 install -Dm644 rpm/dde %{buildroot}/etc/logrotate.d/dde
 
-%pre
-getent group openeuler >/dev/null || groupadd -r openeuler
-getent passwd openeuler >/dev/null || useradd -g openeuler -G wheel -m openeuler > /dev/null 
-echo "openeuler
-openeuler" | passwd openeuler > /dev/null 2>&1
+%post
+systemctl mask suspend.target
+systemctl mask hibernate.target
+systemctl mask suspend-then-hibernate.target
 
 %files
 %{_sysconfdir}/rsyslog.d/dde.conf
 %{_sysconfdir}/logrotate.d/dde
 
 %changelog
+* Mon Aug 21 2023 leeffo <liweiganga@uniontech.com> - 2022.1.4-1
+- upgrade to version 2022.1.4
+
 * Thu Dec 15 2022 liweiganga <liweiganga@uniontech.com> - 2021.06.30-6
 - add install requires dde-calendar
 
-- 
Gitee