diff --git a/dde b/dde deleted file mode 100644 index 9a2e3b5e0a6e2d630227f28efc2120b38b6bf5f7..0000000000000000000000000000000000000000 --- a/dde +++ /dev/null @@ -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 -} diff --git a/dde-2021.06.30.tar.gz b/dde-2021.06.30.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..05e417c2716a620e9ae2beab5614d099e076ea97 Binary files /dev/null and b/dde-2021.06.30.tar.gz differ diff --git a/dde.conf b/dde.conf deleted file mode 100644 index a348d8c45e0c8a1ac7002e2d29dff5f65319f611..0000000000000000000000000000000000000000 --- a/dde.conf +++ /dev/null @@ -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 -} diff --git a/dde.spec b/dde.spec index 42de14cb0a2c7a246abc96584621226eae870920..8945b656ca30240add7f0b85318584d9c0b94659 100644 --- a/dde.spec +++ b/dde.spec @@ -1,68 +1,67 @@ %global debug_package %{nil} Name: dde -Version: 2020.11.03 -Release: 4 +Version: 2021.06.30 +Release: 1 Summary: Deepin New Desktop Environment - Next License: GPLv3 URL: https://uos-packages.deepin.com/uos/pool/main/d/dde/ -Source0: dde.conf -Source1: dde - -BuildRequires: shadow -Requires: systemd-pam -Requires: lightdm -Requires: plymouth -Requires: mesa-dri-drivers -Requires: xorg-x11-server -Requires: dde-api -Requires: dde-kwin -Requires: dde-dock -Requires: deepin-default-settings -Requires: dde-daemon -Requires: dde-desktop -Requires: dde-launcher -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 -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: dde-device-formatter -Requires: deepin-icon-theme -Requires: deepin-turbo -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 +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +BuildRequires: shadow +Requires: systemd-pam +Requires: lightdm +Requires: plymouth +Requires: mesa-dri-drivers +Requires: xorg-x11-server +Requires: dde-api +Requires: dde-kwin +Requires: dde-dock +Requires: deepin-default-settings +Requires: dde-daemon +Requires: dde-desktop +Requires: dde-launcher +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 +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: dde-device-formatter +Requires: deepin-icon-theme +Requires: deepin-turbo +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 Recommends: gnu-free-fonts-common Recommends: sil-padauk-fonts @@ -99,42 +98,45 @@ 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: 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 %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 @@ -147,6 +149,9 @@ openeuler" | passwd openeuler > /dev/null 2>&1 %{_sysconfdir}/logrotate.d/dde %changelog +* Tue Jul 19 2022 loong_C - 2021.06.30-1 +- update to 2021.06.30 + * Thu Feb 24 2022 liweigang - 2020.11.03-4 - add install require