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-2022.1.4.tar.gz b/dde-2022.1.4.tar.gz new file mode 100644 index 0000000..e6b8fd5 Binary files /dev/null and b/dde-2022.1.4.tar.gz differ diff --git a/dde.conf b/dde.conf deleted file mode 100644 index e2e6468..0000000 --- a/dde.conf +++ /dev/null @@ -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 -} - diff --git a/dde.spec b/dde.spec index 7c24f97..7f87a80 100644 --- a/dde.spec +++ b/dde.spec @@ -1,68 +1,78 @@ -%global debug_package %{nil} +%global debug_package %{nil} -Name: dde -Version: 2020.06.11 -Release: 11 -Summary: Deepin New Desktop Environment - Next -License: GPLv3 -URL: https://uos-packages.deepin.com/uos/pool/main/d/dde/ -Source0: https://uos-packages.deepin.com/uos/pool/main/d/dde/%{name}_%{version}.orig.tar.xz -Source1: dde.conf -Source2: dde +Name: dde +Version: 2022.1.4 +Release: 4 +Summary: Deepin New Desktop Environment - Next +License: GPLv3 +URL: https://github.com/linuxdeepin/dde -BuildRequires: shadow -Requires: lightdm -Requires: plymouth -Requires: lightdm-gtk-greeter -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 +Source0: %{name}-%{version}.tar.gz + +BuildRequires: shadow +Requires: systemd-pam +Requires: lightdm +#Requires: lightdm-gtk-greeter +Requires: plymouth +Requires: mesa-dri-drivers +Requires: xorg-x11-server +Requires: librsvg2-tools +Requires: dde-api +Requires: dde-kwin +Requires: dde-dock +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-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: deepin-turbo +#Requires: deepin-clone +Requires: deepin-dbus-generator +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 @@ -99,72 +109,75 @@ 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: im-chooser -Recommends: ibus-libpinyin +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-screensaver +Recommends: deepin-picker +Recommends: firefox +Recommends: gparted 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 -getent group openeuler >/dev/null || groupadd -r openeuler -getent passwd openeuler >/dev/null || useradd -g openeuler -G wheel -m openeuler > /dev/null -echo "openeuler -openeuler" | passwd openeuler > /dev/null 2>&1 +install -Dm644 rpm/dde.conf %{buildroot}/etc/rsyslog.d/dde.conf +install -Dm644 rpm/dde %{buildroot}/etc/logrotate.d/dde + +%post +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 - 2022.1.4-4 +- modify spec remove openeuler info + * Mon Nov 09 2020 chenbo pan - 2020.06.11-11 - modify fonts rpm requires to recommends * Mon Nov 09 2020 weidong - 2020.06.11-10 -- modify some requires +- modify some requires * Wed Nov 04 2020 weidong - 2020.06.11-9 - Change the default user to openeuler * Wed Oct 21 2020 weidong - 2020.06.11-8 -- modify some requires +- modify some requires * Fri Oct 16 2020 chenbo pan - 2020.06.11-7 -- modify some requires +- modify some requires * Fri Sep 11 2020 chenbo pan - 2020.06.11-6 - fix ddeuser error @@ -176,7 +189,7 @@ openeuler" | passwd openeuler > /dev/null 2>&1 - add ddeuser * Thu Sep 10 2020 chenbo pan - 2020.06.11-3 -- remove requires deepin-gir-generator +- remove requires deepin-gir-generator * Thu Sep 10 2020 chenbo pan - 2020.06.11-2 - fix src tar diff --git a/dde_2020.06.11.orig.tar.xz b/dde_2020.06.11.orig.tar.xz deleted file mode 100644 index 99b9066..0000000 Binary files a/dde_2020.06.11.orig.tar.xz and /dev/null differ