update version to 2021.05.24

(cherry picked from commit 52b1919d9efd63ac0cca51ac76b092fef22f64a8)

deepin-desktop-base.spec

@@ -1,39 +1,42 @@
+%global         debug_package %{nil}
+
 Name:           deepin-desktop-base
-Version:        2020.09.11
+Version:        2021.05.24
-Release:        2
+Release:        1
 Summary:        Base files for Deepin Desktop
 License:        GPLv3
 URL:            https://github.com/linuxdeepin/deepin-desktop-base
-Source0:        %{url}/archive/%{version}/%{name}_%{version}.tar.xz
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-BuildArch:      noarch
+Patch0:         0001-fix-logo.patch
-Patch1:         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}.
 
+%package        -n license-config
+Summary:        uos server license config
+Provides:       license-config >= 0.0.4-3
+Obsoletes:      license-config < 0.0.4-3
+%description    -n license-config
+%{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}
 %make_build
 
 %install
@@ -47,7 +50,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 +69,17 @@ 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
+%files -n license-config
+%{_sysconfdir}/.uos/os-license
+%{_sysconfdir}/os-version
 
 %changelog
+* 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