upgrade to version 2022.1.4

Signed-off-by: lvgenggeng <lvgenggeng@uniontech.com>

README.en.md

@@ -1,62 +0,0 @@
-# dde
-
-#### Description
-Deepin New Desktop Environment - Next
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1. Download Openeuler ISO image and install the system
-
-   ```
-   https://openeuler.org/zh/download/
-   ```
-
-2. Update software source
-
-   ```
-   sudo dnf update
-   ```
-
-3. Install DDE
-
-   ```
-   sudo dnf install dde
-   ```
-
-4. The settings are started as a graphical interface
-
-   ```
-   sudo systemctl set-default graphical.target
-   ```
-
-5. restart
-
-   ```
-   sudo reboot
-   ```
-
-6. After the restart is completed, login to the desktop using the user created during the installation or openeuler user
-
-   ```
-   DDE desktop cannot login with root account. DDE has built-in openeuler user whose password is openeuler
-   ```
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

README.md

@@ -1,63 +0,0 @@
-# dde
-
-#### 介绍
-Deepin New Desktop Environment - Next
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1. [下载](https://openeuler.org/zh/download/)openEuler ISO镜像并安装系统
-
-   ```
-   https://openeuler.org/zh/download/
-   ```
-
-2. 更新软件源
-
-   ```
-   sudo dnf update
-   ```
-
-3. 安装DDE
-
-   ```
-   sudo dnf install dde
-   ```
-
-4. 设置以图形界面的方式启动
-
-   ```
-   sudo systemctl set-default graphical.target
-   ```
-
-5. 重启
-
-   ```
-   sudo reboot
-   ```
-
-6. 在重启完成后，使用安装过程中创建的用户或openeuler用户登陆桌面
-
-   ```
-   dde桌面无法使用root账号登陆 dde内置了openeuler用户，此用户的密码为openeuler
-   ```
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 码云特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

dde.spec

@@ -1,12 +1,13 @@
-%global debug_package   %{nil}
+%global     debug_package %{nil}
 
-Name:           dde
+Name:       dde
-Version:        2021.06.30
+Version:    2022.1.4
-Release:        6
+Release:    5
-Summary:        Deepin New Desktop Environment - Next
+Summary:    Deepin New Desktop Environment - Next
-License:        GPLv3
+License:    GPLv3
-URL:            https://uos-packages.deepin.com/uos/pool/main/d/dde/
+URL:        https://github.com/linuxdeepin/dde
-Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+
+Source0:    %{name}-%{version}.tar.gz
 
 BuildRequires:  shadow
 Requires:       systemd-pam
@@ -29,7 +30,7 @@ Requires:       startdde
 Requires:       dde-polkit-agent
 Requires:       dde-file-manager
 Requires:       dde-account-faces
-Requires:       dde-network-utils
+Requires:       dde-network-core
 Requires:       dde-control-center
 Requires:       libdde-file-manager
 Requires:       dde-session-shell
@@ -47,13 +48,12 @@ Requires:       deepin-default-settings
 Requires:       deepin-desktop-schemas
 Requires:       deepin-system-monitor
 Requires:       qt5dxcb-plugin
-Requires:       dde-network-utils
+#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
@@ -66,9 +66,16 @@ Requires:       passwd
 Requires:       dtkcore
 Requires:       dtkgui
 Requires:       dtkwidget
+Requires:       dtkcommon
 Requires:       deepin-draw
 Requires:       deepin-screen-recorder
 Requires:       deepin-pw-check
+Requires:       dde-server-industry-config
+Requires:       dde-qt5xcb-plugin
+Requires:       dde-dconfig-daemon
+Requires:       deepin-desktop-server
+Requires:       qt5-qttranslations
+#Requires:	ibus-libpinyin
 
 Recommends:     gnu-free-fonts-common
 Recommends:     sil-padauk-fonts
@@ -119,16 +126,18 @@ Recommends:     deepin-graphics-driver-manager
 Recommends:     deepin-log-viewer
 Recommends:     libpam-deepin-security
 Recommends:     deepin-manual 
-Recommends:     dde-introduction
+#Recommends:     dde-introduction
 Recommends:     deepin-calculator
 Recommends:     deepin-screenshot
+Recommends:     deepin-screensaver
 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
+Recommends:     deepin-fcitxconfigtool-plugin
+Recommends:     fcitx fcitx-qt5 fcitx-pinyin fcitx-sunpinyin fcitx-configtool fcitx-table-chinese fcitx-cloudpinyin
 
 %description
 Deepin New Desktop Environment.
@@ -145,17 +154,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
+%post
-getent group openeuler >/dev/null || groupadd -r openeuler
+systemctl mask suspend.target
-getent passwd openeuler >/dev/null || useradd -g openeuler -G wheel -m openeuler > /dev/null 
+systemctl mask hibernate.target
-echo "openeuler
+systemctl mask suspend-then-hibernate.target
-openeuler" | passwd openeuler > /dev/null 2>&1
 
 %files
 %{_sysconfdir}/rsyslog.d/dde.conf
 %{_sysconfdir}/logrotate.d/dde
 
 %changelog
+* Tue Jun 18 2024 lvgenggeng <lvgenggeng@uniontech.com> - 2022.1.4-5
+- upgrade to version 2022.1.4
+
 * Thu Dec 15 2022 liweiganga <liweiganga@uniontech.com> - 2021.06.30-6
 - add install requires dde-calendar