update to upstream 2021.06.30

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,69 +1,73 @@
 %global debug_package   %{nil}
 
 Name:           dde
-Version:        2020.11.03
+Version:        2021.06.30
 Release:        5
 Summary:        Deepin New Desktop Environment - Next
 License:        GPLv3
 URL:            https://uos-packages.deepin.com/uos/pool/main/d/dde/
-Source0:        dde.conf
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Source1:        dde
 
-BuildRequires:	shadow
+BuildRequires:  shadow
-Requires:  	systemd-pam
+Requires:       systemd-pam
-Requires:  	lightdm
+Requires:       lightdm
-Requires:	plymouth
+#Requires:       lightdm-gtk-greeter
-Requires:  	mesa-dri-drivers
+Requires:       plymouth
-Requires:  	xorg-x11-server
+Requires:       mesa-dri-drivers
+Requires:       xorg-x11-server
 Requires:       librsvg2-tools
-Requires:  	dde-api
+Requires:       dde-api
-Requires:  	dde-kwin
+Requires:       dde-kwin
-Requires:  	dde-dock
+Requires:       dde-dock
-Requires:  	deepin-default-settings
+Requires:       deepin-default-settings
-Requires:  	dde-daemon
+Requires:       dde-daemon
-Requires:  	dde-desktop
+Requires:       dde-desktop
-Requires:  	dde-launcher
+Requires:       dde-launcher
-Requires:  	dde-clipboard
+Requires:       dde-clipboard
-Requires:  	startdde
+Requires:       startdde
-Requires:  	dde-polkit-agent
+Requires:       dde-polkit-agent
-Requires:  	dde-file-manager
+Requires:       dde-file-manager
-Requires:  	dde-polkit-agent
+Requires:       dde-account-faces
-Requires:  	dde-account-faces
+Requires:       dde-network-utils
-Requires:  	dde-network-utils
+Requires:       dde-control-center
-Requires:  	dde-control-center
+Requires:       libdde-file-manager
-Requires:  	libdde-file-manager
+Requires:       dde-session-shell
-Requires:  	dde-session-shell
+Requires:       dde-session-ui
-Requires:  	dde-session-ui
+Requires:       dde-qt5integration
-Requires:  	dde-qt5integration
+Requires:       dde-qt-dbus-factory
-Requires:  	dde-qt-dbus-factory
+Requires:       dde-disk-mount-plugin
-Requires:  	dde-disk-mount-plugin
+Requires:       dde-dock-onboard-plugin
-Requires:  	dde-dock-onboard-plugin
+Requires:       deepin-anything-libs
-Requires:  	deepin-anything-libs
+#Requires:       deepin-qml-widgets
-Requires:  	deepin-qml-widgets
+Requires:       deepin-menu
-Requires:  	deepin-menu
+Requires:       deepin-desktop-base
-Requires:  	deepin-desktop-base
+Requires:       deepin-icon-theme
-Requires:  	deepin-icon-theme
+Requires:       deepin-default-settings
-Requires:  	deepin-default-settings
+Requires:       deepin-desktop-schemas
-Requires:  	deepin-desktop-schemas
+Requires:       deepin-system-monitor
-Requires:  	deepin-system-monitor
+Requires:       qt5dxcb-plugin
-Requires:  	qt5dxcb-plugin
+Requires:       dde-network-utils
-Requires:  	dde-network-utils
+Requires:       deepin-wallpapers
-Requires:  	deepin-wallpapers
+Requires:       deepin-gtk-theme
-Requires:  	deepin-gtk-theme
+Requires:       deepin-anything-server
-Requires:  	deepin-anything-server
+Requires:       deepin-anything-dkms
-Requires:  	deepin-anything-dkms
+Requires:       dde-device-formatter
-Requires:	dde-device-formatter
+Requires:       deepin-icon-theme
-Requires:	dde-device-formatter
+Requires:       deepin-turbo
-Requires:	deepin-icon-theme
+#Requires:       deepin-clone
-Requires:	deepin-turbo
+Requires:       deepin-dbus-generator
-Requires:	deepin-clone
+Requires:       deepin-gettext-tools
-Requires:	deepin-dbus-generator
+Requires:       deepin-editor
-Requires:	deepin-desktop-base
+Requires:       deepin-font-manager
-Requires:	deepin-gettext-tools
+Requires:       deepin-reader
-Requires:   	deepin-editor
+Requires:       gnome-keyring
-Requires:   	deepin-font-manager
+Requires:       passwd
-Requires:   	deepin-reader
+Requires:       dtkcore
-Requires:   	gnome-keyring
+Requires:       dtkgui
+Requires:       dtkwidget
+Requires:       deepin-draw
+Requires:       deepin-screen-recorder
+Requires:       deepin-pw-check
 
 Recommends:     gnu-free-fonts-common
 Recommends:     sil-padauk-fonts
@@ -100,42 +104,45 @@ 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-picker
-Recommends:	firefox
+Recommends:     firefox
-Recommends:	gparted
+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
 
 %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
+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
@@ -148,8 +155,21 @@ openeuler" | passwd openeuler > /dev/null 2>&1
 %{_sysconfdir}/logrotate.d/dde
 
 %changelog
-* Tue Aug 09 2022 liweiganga <liweiganga@uniontech.com> - 2020.11.03-5
+* Mon Aug 08 2022 liweiganga <liweiganga@uniontech.com> - 2021.06.30-5
-- add install require
+- 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