!25 update to upstream 2021.05.24-3

From: @xzyangha 
Reviewed-by: @yeqinglong01 
Signed-off-by: @yeqinglong01
This commit is contained in:
openeuler-ci-bot 2022-10-21 06:04:03 +00:00 committed by Gitee
commit 4c8a65e12a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 22 additions and 11 deletions

Binary file not shown.

View File

@ -1,36 +1,37 @@
%global debug_package %{nil}
Name: deepin-desktop-base
Version: 2020.09.11
Release: 2
Version: 2021.05.24
Release: 3
Summary: Base files for Deepin Desktop
License: GPLv3
URL: https://github.com/linuxdeepin/deepin-desktop-base
Source0: %{url}/archive/%{version}/%{name}_%{version}.tar.xz
BuildArch: noarch
Patch1: 0001-fix-logo.patch
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: 0001-fix-logo.patch
%description
%{summary}.
%package -n deepin-desktop-server
BuildArch: noarch
Summary: Base files for Deepin Desktop Server
Provides: deepin-desktop-base
Obsoletes: deepin-desktop-base < %{version}
Recommends: deepin-wallpapers
Recommends: deepin-screensaver
%description -n deepin-desktop-server
%{summary}.
%prep
%autosetup -p1 -n %{name}-%{version}+dde
%autosetup -p1
%build
# Remove Deepin lsb-release
sed -i '/lsb-release/d' Makefile
# update lusr/lib/ path
# update usr/lib/ path
sed -i 's|/usr/lib|%{_datadir}|' Makefile
sed -i 's|Type=.*|Type=Desktop|' files/{desktop-version-arm-server.in,desktop-version-server.in,desktop-version.in}
# 社区版
sed -i 's|Type\[zh_CN\]=.*|Type\[zh_CN\]=社区版|' files/{desktop-version-arm-server.in,desktop-version-server.in,desktop-version.in}
sed -i 's|Edition=.*|Edition=Y2020E0001|' files/{desktop-version-arm-server.in,desktop-version-server.in,desktop-version.in}
sed -i 's|Copyright=.*|Copyright=Y2020CR001|' files/{desktop-version-arm-server.in,desktop-version-server.in,desktop-version.in}
@ -47,7 +48,7 @@ install -Dm644 files/systemd.conf %{buildroot}/%{_sysconfdir}/systemd/system.co
install -Dm644 files/dde-session-ui.conf %{buildroot}/etc/deepin/dde-session-ui.conf
install -Dm644 files/desktop-version-server %{buildroot}%{_datadir}/deepin/desktop-version-server
ln -sfv %{_datadir}/deepin/desktop-version-server %{buildroot}%{_sysconfdir}/deepin-version
#install -Dm644 files/os-license %{buildroot}/%{_sysconfdir}/.uos/os-license
%files -n deepin-desktop-server
%{_sysconfdir}/deepin-version
@ -66,12 +67,22 @@ ln -sfv %{_datadir}/deepin/desktop-version-server %{buildroot}%{_sysconfdir}/dee
%{_sysconfdir}/deepin/dde-session-ui.conf
%exclude %{_sysconfdir}/systemd/logind.conf.d/deepin-base.conf
%exclude %{_sysconfdir}/systemd/system.conf.d/deepin-base.conf
%exclude %{_sysconfdir}/systemd/user.conf.d/deepin-base.conf
%exclude %{_datadir}/deepin/desktop-version
# conflicts with file from package license-config
%exclude %{_localstatedir}/uos/os-license
%exclude %{_sysconfdir}/os-version
%changelog
* Fri Aug 05 2022 liweiganga <liweiganga@uniontech.com> - 2021.05.24-3
- fix version type
* Tue Aug 02 2022 liweiganga <liweiganga@uniontech.com> - 2021.05.24-2
- Modified to Community Edition
* Mon Jul 18 2022 konglidong <konglidong@uniontech.com> - 2021.05.24-1
- update to 2021.05.24
* Thu Aug 26 2021 konglidong <konglidong@uniontech.com - 2020.09.11-2
- Fix versions
- Fix logos error