update dde package

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,137 +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,21 +1,22 @@
 %global     debug_package %{nil}
 
 Name:       dde
-Version:        2020.06.11
+Version:    2022.1.4
-Release:        11
+Release:    4
 Summary:    Deepin New Desktop Environment - Next
 License:    GPLv3
-URL:            https://uos-packages.deepin.com/uos/pool/main/d/dde/
+URL:        https://github.com/linuxdeepin/dde
-Source0:        https://uos-packages.deepin.com/uos/pool/main/d/dde/%{name}_%{version}.orig.tar.xz
+
-Source1:        dde.conf
+Source0:    %{name}-%{version}.tar.gz
-Source2:        dde
 
 BuildRequires:  shadow
+Requires:       systemd-pam
 Requires:       lightdm
+#Requires:       lightdm-gtk-greeter
 Requires:       plymouth
-Requires:  	lightdm-gtk-greeter
 Requires:       mesa-dri-drivers
 Requires:       xorg-x11-server
+Requires:       librsvg2-tools
 Requires:       dde-api
 Requires:       dde-kwin
 Requires:       dde-dock
@@ -23,11 +24,11 @@ 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-polkit-agent
 Requires:       dde-account-faces
 Requires:       dde-network-utils
 Requires:       dde-control-center
@@ -39,7 +40,7 @@ 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-qml-widgets
 Requires:       deepin-menu
 Requires:       deepin-desktop-base
 Requires:       deepin-icon-theme
@@ -47,22 +48,31 @@ 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:	dde-device-formatter
-Requires:	deepin-icon-theme
 Requires:       deepin-turbo
-Requires:	deepin-clone
+#Requires:       deepin-clone
 Requires:       deepin-dbus-generator
-Requires:	deepin-desktop-base
 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:       dtkcommon
+Requires:       deepin-screen-recorder
+Requires:       deepin-pw-check
+Requires:       dde-server-industry-config
+Requires:       deepin-desktop-server
+Requires:       qt5-qttranslations
+Requires:	ibus-libpinyin
 
 Recommends:     gnu-free-fonts-common
 Recommends:     sil-padauk-fonts
@@ -113,44 +123,47 @@ 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:	im-chooser
-Recommends:	ibus-libpinyin
 Recommends:     onboard
 Recommends:     glibc-all-langpacks
 Recommends:     langpacks-zh_CN
+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
+%setup -q -n %{name}-%{version}
 
 %build
+echo "build"
 
 %install
 mkdir -p %{buildroot}/etc/{rsyslog.d,logrotate.d}
-install -Dm644 %{SOURCE1} %{buildroot}/etc/rsyslog.d/dde.conf
-install -Dm644 %{SOURCE2} %{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
-%doc debian/copyright
-%doc debian/changelog
 %{_sysconfdir}/rsyslog.d/dde.conf
 %{_sysconfdir}/logrotate.d/dde
 
 %changelog
+* Tue Nov 28 2023 hanshuang <hanshuang@uniontech.com> - 2022.1.4-4
+- modify spec remove openeuler info
+
 * Mon Nov 09 2020 chenbo pan <panchenbo@uniontech.com> - 2020.06.11-11
 - modify fonts rpm requires to recommends