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-2022.1.4.tar.gz b/dde-2022.1.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e6b8fd5c275c8dedf02ea9b25e4b1c1c156dcace 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 e2e6468cd80d9093cd75f5b7d65f58d5f0569fef..0000000000000000000000000000000000000000 --- 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 7c24f973748eee0b0d09bf7d7c6b8489d3e6fc36..bb25d42e2325bd2370ea29c514fa5485d334c3ef 100644 --- a/dde.spec +++ b/dde.spec @@ -1,185 +1,123 @@ -%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 - -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 - -Recommends: gnu-free-fonts-common -Recommends: sil-padauk-fonts -Recommends: urw-base35-c059-fonts -Recommends: urw-base35-z003-fonts -Recommends: google-noto-cjk-fonts -Recommends: paratype-pt-sans-fonts -Recommends: urw-base35-nimbus-sans-fonts -Recommends: fonts-filesystem -Recommends: google-noto-emoji-fonts -Recommends: google-noto-serif-cjk-ttc-fonts -Recommends: gnu-free-serif-fonts -Recommends: sil-abyssinica-fonts -Recommends: jomolhari-fonts -Recommends: urw-base35-gothic-fonts -Recommends: urw-base35-p052-fonts -Recommends: google-noto-sans-cjk-ttc-fonts -Recommends: gnu-free-sans-fonts -Recommends: sil-nuosu-fonts -Recommends: julietaula-montserrat-fonts -Recommends: urw-base35-fonts-common -Recommends: urw-base35-bookman-fonts -Recommends: urw-base35-nimbus-mono-ps-fonts -Recommends: urw-base35-standard-symbols-ps-fonts -Recommends: google-droid-sans-fonts -Recommends: gnu-free-mono-fonts -Recommends: paktype-naskh-basic-fonts -Recommends: urw-base35-nimbus-roman-fonts -Recommends: abattis-cantarell-fonts -Recommends: stix-fonts -Recommends: urw-base35-d050000l-fonts -Recommends: navilu-fonts -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: onboard -Recommends: glibc-all-langpacks -Recommends: langpacks-zh_CN +%global debug_package %{nil} + +Name: dde +Version: 2022.1.4 +Release: 1%{?dist}.02 +Summary: Deepin New Desktop Environment - Next +License: GPLv3 +URL: https://github.com/linuxdeepin/dde + +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +## 底层组件 +Requires: lightdm +Requires: mesa-dri-drivers +Requires: xorg-x11-server-Xorg +Requires: librsvg2-tools +## DDE +Requires: dde-control-center +Requires: dde-daemon +Requires: dde-dock +Requires: dde-dock-onboard-plugin +Requires: dde-launcher +Requires: dde-network-utils +Requires: dde-polkit-agent +Requires: dde-qt-dbus-factory +Requires: dde-server-industry-config +Requires: dde-session-shell +Requires: dde-session-ui +Requires: dde-account-faces +Requires: deepin-default-settings +Requires: deepin-desktop-schemas +Requires: deepin-gettext-tools +Requires: deepin-menu +Requires: dtkcore +Requires: dtkgui +Requires: dtkwidget +Requires: dde-qt5integration +Requires: startdde +Requires: uos-license-content +Requires: dde-qt5xcb-plugin +Requires: dde-api +Requires: dpa-ext-gnomekeyring +Requires: dtkcommon +## 其他 +Requires: deepin-desktop-server +Requires: deepin-icon-theme +Requires: deepin-gtk-theme +Requires: deepin-sound-theme +## 文管 +Requires: dde-desktop +Requires: dde-file-manager +Requires: dde-disk-mount-plugin +Requires: deepin-wallpapers +Requires: deepin-shortcut-viewer + +## 窗管 +Requires: dde-kwin +## 应用 +Requires: deepin-system-monitor +Requires: dde-calendar +Requires: dde-clipboard +Requires: dde-device-formatter +Requires: deepin-calculator +Requires: deepin-compressor +Requires: deepin-devicemanager +Requires: deepin-editor +Requires: deepin-log-viewer +%ifnarch loongarch64 +Requires: deepin-manual +%endif +Requires: deepin-reader +Requires: deepin-screen-recorder +Requires: deepin-screensaver +Requires: deepin-terminal +Requires: org.deepin.browser +Requires: gparted +Requires: deepin-boot-maker +## 输入法 +Requires: fcitx +Requires: fcitx-qt5 +Requires: fcitx-pinyin +Requires: fcitx-configtool +Requires: fcitx-table-chinese +Requires: deepin-fcitxconfigtool-plugin +Requires: fcitx-sunpinyin +Requires: fcitx-cloudpinyin +## 需求 +# support exfat +Requires: exfat-utils +Requires: fuse-exfat +## bugfix +## fix messages error +Requires: gnome-keyring +## fix translation error +Requires: qt5-qttranslations +Requires: deepin-pw-check %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 %files -%doc debian/copyright -%doc debian/changelog %{_sysconfdir}/rsyslog.d/dde.conf %{_sysconfdir}/logrotate.d/dde %changelog -* 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 - -* 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 - -* Fri Oct 16 2020 chenbo pan - 2020.06.11-7 -- modify some requires - -* Fri Sep 11 2020 chenbo pan - 2020.06.11-6 -- fix ddeuser error - -* Thu Sep 10 2020 chenbo pan - 2020.06.11-5 -- fix add ddeuser - -* Thu Sep 10 2020 chenbo pan - 2020.06.11-4 -- add ddeuser - -* Thu Sep 10 2020 chenbo pan - 2020.06.11-3 -- remove requires deepin-gir-generator +* Thu Jun 23 2022 liweiganga - 2022.1.4-1.02 +- fix: loongarch64 not RE deepin-manual -* Thu Sep 10 2020 chenbo pan - 2020.06.11-2 -- fix src tar +* Tue Jun 14 2022 uoser - 2022.1.4-1.01 +- update to 2022.1.4-1.01 -* Tue Sep 8 2020 chenbo pan - 2020.06.11-1 -- project init. diff --git a/dde.yaml b/dde.yaml deleted file mode 100644 index 175133640142a42e8224062acfdb0149f6588002..0000000000000000000000000000000000000000 --- a/dde.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version_control: github -src_repo: linuxdeepin/dde -tag_prefix: ^v -seperator: . diff --git a/dde_2020.06.11.orig.tar.xz b/dde_2020.06.11.orig.tar.xz deleted file mode 100644 index 99b9066c33b5129db5752513055948a1ac23c4e9..0000000000000000000000000000000000000000 Binary files a/dde_2020.06.11.orig.tar.xz and /dev/null differ