From 712aa1ce13cb3798d16cd92a4d2af9340c9a3f12 Mon Sep 17 00:00:00 2001 From: weidong Date: Tue, 23 Feb 2021 11:41:43 +0800 Subject: [PATCH 1/2] Update deepin-version --- deepin-desktop-base.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/deepin-desktop-base.spec b/deepin-desktop-base.spec index 1a1349a..034d2ea 100644 --- a/deepin-desktop-base.spec +++ b/deepin-desktop-base.spec @@ -1,6 +1,6 @@ Name: deepin-desktop-base Version: 2020.03.23 -Release: 2 +Release: 3 Summary: Base files for Deepin Desktop License: GPLv3 URL: https://github.com/linuxdeepin/deepin-desktop-base @@ -27,8 +27,9 @@ Base files for Deepin Desktop. sed -i -E '/lsb-release/d' Makefile sed -i 's|/usr/lib|%{_datadir}|' Makefile sed -i 's|VERSION := 20 SP1|VERSION := 20|' Makefile -sed -i 's|Type=.*|Type=Server-Euler|' files/desktop-version-arm.in -sed -i 's|Type\[zh_CN\]=.*|Type\[zh_CN\]=服务器欧拉版|' files/desktop-version-arm.in +sed -i 's|Type=.*|Type=Desktop|' files/{desktop-version-arm.in,desktop-version.in} +sed -i 's|Type\[zh_CN\]=.*|Type\[zh_CN\]=社区版|' files/{desktop-version-arm.in,desktop-version.in} + %build %make_build @@ -106,6 +107,9 @@ ln -sfv ..%{_datadir}/deepin/desktop-version %{buildroot}/etc/deepin-version %{_datadir}/deepin/distribution/distribution_logo_transparent.svg %changelog +* Tue Feb 23 2021 weidong - 2020.03.23-3 +- Update deepin-version + * Sat Dec 05 2020 weidong - 2020.03.23-2 - fix logo -- Gitee From ee1d6125d4190500a8f745e5ba1055b92fc9a5e6 Mon Sep 17 00:00:00 2001 From: wei dong Date: Sat, 5 Jun 2021 14:07:34 +0800 Subject: [PATCH 2/2] Fix installation dependency errors --- deepin-desktop-base.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/deepin-desktop-base.spec b/deepin-desktop-base.spec index 034d2ea..ad3d647 100644 --- a/deepin-desktop-base.spec +++ b/deepin-desktop-base.spec @@ -1,6 +1,6 @@ Name: deepin-desktop-base Version: 2020.03.23 -Release: 3 +Release: 4 Summary: Base files for Deepin Desktop License: GPLv3 URL: https://github.com/linuxdeepin/deepin-desktop-base @@ -15,7 +15,8 @@ Base files for Deepin Desktop. %package -n deepin-desktop-server Summary: Base files for Deepin Desktop -Requires: deepin-keyring distro-info-data eject fonts-noto fonts-symbola +Recommends: deepin-wallpapers +Recommends: deepin-screensaver %description -n deepin-desktop-server @@ -107,6 +108,9 @@ ln -sfv ..%{_datadir}/deepin/desktop-version %{buildroot}/etc/deepin-version %{_datadir}/deepin/distribution/distribution_logo_transparent.svg %changelog +* Sat Jun 05 2021 weidong - 2020.03.23-4 +- Fix installation dependency errors + * Tue Feb 23 2021 weidong - 2020.03.23-3 - Update deepin-version -- Gitee