diff --git a/deepin-desktop-base-2021.05.24.tar.gz b/deepin-desktop-base-2021.05.24.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b06e2b80a8ad1d25cc03804f4e43437aaf3d3a3f Binary files /dev/null and b/deepin-desktop-base-2021.05.24.tar.gz differ diff --git a/deepin-desktop-base.spec b/deepin-desktop-base.spec index 457a581dbcda39bb0a894aa13c1834719ecf2365..1e03a20bbe520ad14cb32c29d26f3d97d34f71d9 100644 --- a/deepin-desktop-base.spec +++ b/deepin-desktop-base.spec @@ -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 - 2021.05.24-3 +- fix version type + +* Tue Aug 02 2022 liweiganga - 2021.05.24-2 +- Modified to Community Edition + +* Mon Jul 18 2022 konglidong - 2021.05.24-1 +- update to 2021.05.24 + * Thu Aug 26 2021 konglidong