From 61e35bb06eaa03c6085f8257932b351b9b5b65c3 Mon Sep 17 00:00:00 2001 From: loong_C Date: Tue, 19 Jul 2022 13:20:03 +0800 Subject: [PATCH] update version to 2021.06.30 (cherry picked from commit 5285ba50f2a66a7d4c14f03913b91abcf5d63799) --- dde | 13 ---- dde-2021.06.30.tar.gz | Bin 0 -> 30720 bytes dde.conf | 136 ---------------------------------- dde.spec | 167 ++++++++++++++++++++++-------------------- 4 files changed, 86 insertions(+), 230 deletions(-) delete mode 100644 dde create mode 100644 dde-2021.06.30.tar.gz delete mode 100644 dde.conf diff --git a/dde b/dde deleted file mode 100644 index 9a2e3b5..0000000 --- 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 GIT binary patch literal 30720 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 literal 0 HcmV?d00001 diff --git a/dde.conf b/dde.conf deleted file mode 100644 index a348d8c..0000000 --- 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 98507ae..74a7f80 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 +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 +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