!87 回合SP3版本代码

From: @lvgenggeng 
Reviewed-by: @xzyangha 
Signed-off-by: @xzyangha

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

@@ -1,13 +0,0 @@
-/var/log/dde.log
-{
-    maxage 365
-    rotate 10
-    notifempty
-    copytruncate
-    missingok
-    size +10240k
-    sharedscripts
-    postrotate
-        /usr/bin/systemctl kill -s HUP rsyslog.service >/dev/null 2>&1 || true
-    endscript
-}

dde.conf

@@ -1,136 +0,0 @@
-$FileCreateMode 0600
-$outchannel dde, /var/log/dde.log
-
-if ($programname contains 'dde') then {
-:omfile:$dde
-stop
-}
-
-if ($programname contains 'deepin') then {
-:omfile:$dde
-stop
-}
-
-if ($programname contains 'kwin_x11') then {
-:omfile:$dde
-stop
-}
-
-if ($programname contains 'kglobalaccel5') then {
-:omfile:$dde
-stop
-}
-
-if ($programname contains 'mime') then {
-:omfile:$dde
-stop
-}
-
-if ($programname contains 'appearance') then {
-:omfile:$dde
-stop
-}
-
-if ($programname contains 'pulseaudio') then {
-:omfile:$dde
-stop
-}
-
-if ($msg contains 'loader.go') then {
-:omfile:$dde
-stop
-}
-
-if ($msg contains 'manager.go') then {
-:omfile:$dde
-stop
-}
-
-if ($msg contains 'config_data.go') then {
-:omfile:$dde
-stop
-}
-
-if ($msg contains 'deepin') then {
-:omfile:$dde
-stop
-}
-
-if ($msg contains 'dock_manager_entries.go') then {
-:omfile:$dde
-stop
-}
-
-if ($syslogtag startswith 'daemon/bluetooth') then {
-:omfile:$dde
-stop
-}
-
-if ($syslogtag startswith 'daemon/appearance') then {
-:omfile:$dde
-stop
-}
-
-if ($syslogtag startswith 'daemon/systeminfo') then {
-:omfile:$dde
-stop
-}
-
-if ($syslogtag startswith 'daemon/audio') then {
-:omfile:$dde
-stop
-}
-
-if ($syslogtag startswith 'daemon/dock') then {
-:omfile:$dde
-stop
-}
-
-if ($syslogtag startswith 'daemon/apps') then {
-:omfile:$dde
-stop
-}
-
-if ($syslogtag startswith 'daemon/launcher') then {
-:omfile:$dde
-stop
-}
-
-if ($syslogtag startswith 'daemon/calendar') then {
-:omfile:$dde
-stop
-}
-
-if ($syslogtag startswith 'daemon/network') then {
-:omfile:$dde
-stop
-}
-
-if ($syslogtag startswith 'daemon/accounts') then {
-:omfile:$dde
-stop
-}
-if ($syslogtag startswith 'daemon/screensaver') then {
-:omfile:$dde
-stop
-}
-
-if ($syslogtag startswith 'daemon/image_effect') then {
-:omfile:$dde
-stop
-}
-
-if ($syslogtag startswith 'daemon/system/power') then {
-:omfile:$dde
-stop
-}
-
-if ($syslogtag startswith 'daemon/session/power') then {
-:omfile:$dde
-stop
-}
-
-if ($syslogtag startswith 'daemon/dde-session-daemon') then {
-:omfile:$dde
-stop
-}

dde.spec

@@ -1,68 +1,81 @@
-%global debug_package   %{nil}
+%global     debug_package %{nil}
 
-Name:           dde
+Name:       dde
-Version:        2020.11.03
+Version:    2022.1.4
-Release:        4
+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:        dde.conf
-Source1:        dde
 
-BuildRequires:	shadow
+Source0:    %{name}-%{version}.tar.gz
-Requires:  	systemd-pam
+
-Requires:  	lightdm
+BuildRequires:  shadow
-Requires:	plymouth
+Requires:       systemd-pam
-Requires:  	mesa-dri-drivers
+Requires:       lightdm
-Requires:  	xorg-x11-server
+#Requires:       lightdm-gtk-greeter
-Requires:  	dde-api
+Requires:       plymouth
-Requires:  	dde-kwin
+Requires:       mesa-dri-drivers
-Requires:  	dde-dock
+Requires:       xorg-x11-server
-Requires:  	deepin-default-settings
+Requires:       librsvg2-tools
-Requires:  	dde-daemon
+Requires:       dde-api
-Requires:  	dde-desktop
+Requires:       dde-kwin
-Requires:  	dde-launcher
+Requires:       dde-dock
-Requires:  	dde-clipboard
+Requires:       deepin-default-settings
-Requires:  	startdde
+Requires:       dde-daemon
-Requires:  	dde-polkit-agent
+Requires:       dde-desktop
-Requires:  	dde-file-manager
+Requires:       dde-launcher
-Requires:  	dde-polkit-agent
+Requires:       dde-calendar
-Requires:  	dde-account-faces
+Requires:       dde-clipboard
-Requires:  	dde-network-utils
+Requires:       startdde
-Requires:  	dde-control-center
+Requires:       dde-polkit-agent
-Requires:  	libdde-file-manager
+Requires:       dde-file-manager
-Requires:  	dde-session-shell
+Requires:       dde-account-faces
-Requires:  	dde-session-ui
+Requires:       dde-network-core
-Requires:  	dde-qt5integration
+Requires:       dde-control-center
-Requires:  	dde-qt-dbus-factory
+Requires:       libdde-file-manager
-Requires:  	dde-disk-mount-plugin
+Requires:       dde-session-shell
-Requires:  	dde-dock-onboard-plugin
+Requires:       dde-session-ui
-Requires:  	deepin-anything-libs
+Requires:       dde-qt5integration
-Requires:  	deepin-qml-widgets
+Requires:       dde-qt-dbus-factory
-Requires:  	deepin-menu
+Requires:       dde-disk-mount-plugin
-Requires:  	deepin-desktop-base
+Requires:       dde-dock-onboard-plugin
-Requires:  	deepin-icon-theme
+Requires:       deepin-anything-libs
-Requires:  	deepin-default-settings
+#Requires:       deepin-qml-widgets
-Requires:  	deepin-desktop-schemas
+Requires:       deepin-menu
-Requires:  	deepin-system-monitor
+Requires:       deepin-desktop-base
-Requires:  	qt5dxcb-plugin
+Requires:       deepin-icon-theme
-Requires:  	dde-network-utils
+Requires:       deepin-default-settings
-Requires:  	deepin-wallpapers
+Requires:       deepin-desktop-schemas
-Requires:  	deepin-gtk-theme
+Requires:       deepin-system-monitor
-Requires:  	deepin-anything-server
+Requires:       qt5dxcb-plugin
-Requires:  	deepin-anything-dkms
+#Requires:       dde-network-utils
-Requires:	dde-device-formatter
+Requires:       deepin-wallpapers
-Requires:	dde-device-formatter
+Requires:       deepin-gtk-theme
-Requires:	deepin-icon-theme
+Requires:       deepin-anything-server
-Requires:	deepin-turbo
+Requires:       deepin-anything-dkms
-Requires:	deepin-clone
+Requires:       dde-device-formatter
-Requires:	deepin-dbus-generator
+Requires:       deepin-turbo
-Requires:	deepin-desktop-base
+#Requires:       deepin-clone
-Requires:	deepin-gettext-tools
+Requires:       deepin-dbus-generator
-Requires:   	deepin-editor
+Requires:       deepin-gettext-tools
-Requires:   	deepin-font-manager
+Requires:       deepin-editor
-Requires:   	deepin-reader
+Requires:       deepin-font-manager
-Requires:   	gnome-keyring
+Requires:       deepin-reader
+Requires:       gnome-keyring
+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
@@ -99,58 +112,84 @@ Recommends:     dejavu-fonts
 Recommends:     khmeros-fonts
 Recommends:     lohit-telugu-fonts
 Recommends:     deepin-image-viewer
-Recommends:  	deepin-shortcut-viewer
+Recommends:     deepin-shortcut-viewer
-Recommends:  	deepin-calendar
+Recommends:     deepin-calendar
-Recommends:  	deepin-sound-theme
+Recommends:     deepin-sound-theme
-Recommends:  	deepin-terminal
+Recommends:     deepin-terminal
-Recommends:  	deepin-keyring
+Recommends:     deepin-keyring
-Recommends:  	blur-effect
+Recommends:     blur-effect
-Recommends:  	deepin-ab-recovery
+Recommends:     deepin-ab-recovery
-Recommends:  	deepin-compressor
+Recommends:     deepin-compressor
-Recommends:  	deepin-devicemanager
+Recommends:     deepin-devicemanager
-Recommends:  	deepin-elf-verify
+Recommends:     deepin-elf-verify
-Recommends:  	deepin-graphics-driver-manager
+Recommends:     deepin-graphics-driver-manager
-Recommends:  	deepin-log-viewer
+Recommends:     deepin-log-viewer
-Recommends:  	libpam-deepin-security
+Recommends:     libpam-deepin-security
-Recommends:  	deepin-manual 
+Recommends:     deepin-manual 
-Recommends:	dde-introduction
+#Recommends:     dde-introduction
-Recommends:	deepin-calculator
+Recommends:     deepin-calculator
-Recommends:	deepin-screenshot
+Recommends:     deepin-screenshot
-Recommends:	deepin-picker
+Recommends:     deepin-screensaver
-Recommends:	firefox
+Recommends:     deepin-picker
-Recommends:	gparted
+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 - Next.
+Deepin New Desktop Environment.
 
 %prep
+%setup -q -n %{name}-%{version}
 
 %build
+echo "build"
 
 %install
 mkdir -p %{buildroot}/etc/{rsyslog.d,logrotate.d}
-install -Dm644 %{SOURCE0} %{buildroot}/etc/rsyslog.d/dde.conf
-install -Dm644 %{SOURCE1} %{buildroot}/etc/logrotate.d/dde
 
-%pre
+install -Dm644 rpm/dde.conf %{buildroot}/etc/rsyslog.d/dde.conf
-getent group openeuler >/dev/null || groupadd -r openeuler
+install -Dm644 rpm/dde %{buildroot}/etc/logrotate.d/dde
-getent passwd openeuler >/dev/null || useradd -g openeuler -G wheel -m openeuler > /dev/null 
+
-echo "openeuler
+%post
-openeuler" | passwd openeuler > /dev/null 2>&1
+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
+* 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
+
+* Mon Aug 08 2022 liweiganga <liweiganga@uniontech.com> - 2021.06.30-5
+- Delete requires lightdm-greeter
+
+* Mon Aug 08 2022 liweiganga <liweiganga@uniontech.com> - 2021.06.30-4
+- add install requires
+
+* Mon Aug 01 2022 liweiganga <liweiganga@uniontech.com> - 2021.06.30-3
+- add the default user openeuler
+
+* Mon Aug 01 2022 liweiganga <liweiganga@uniontech.com> - 2021.06.30-2
+- remove unused and duplicate packages
+- Delete and create a common user, log in with an existing user
+
+* Tue Jul 19 2022 loong_C <loong_c@yeah.net> - 2021.06.30-1
+- update to 2021.06.30
+
 * Thu Feb 24 2022 liweigang <liweiganga@uniontech.com> - 2020.11.03-4
 - add install require
 
-* Tue Aug 26 2021 heyitao <heyitao@uniontech.com> - 2020.11.03-3
+* Thu Aug 26 2021 heyitao <heyitao@uniontech.com> - 2020.11.03-3
 - add install require
 
 * Tue Aug 03 2021 weidong <weidong@uniontech.com> - 2020.11.03-2