!13 Update deepin-desktop-base to 2020.09.11
From: @weidongkl Reviewed-by: @yeqinglong01 Signed-off-by: @yeqinglong01
This commit is contained in:
commit
bb740a3728
File diff suppressed because one or more lines are too long
@ -1,113 +1,76 @@
|
|||||||
Name: deepin-desktop-base
|
Name: deepin-desktop-base
|
||||||
Version: 2020.03.23
|
Version: 2020.09.11
|
||||||
Release: 4
|
Release: 1
|
||||||
Summary: Base files for Deepin Desktop
|
Summary: Base files for Deepin Desktop
|
||||||
License: GPLv3
|
License: GPLv3
|
||||||
URL: https://github.com/linuxdeepin/deepin-desktop-base
|
URL: https://github.com/linuxdeepin/deepin-desktop-base
|
||||||
Source0: %{name}_%{version}.orig.tar.xz
|
Source0: %{url}/archive/%{version}/%{name}_%{version}.tar.xz
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Patch1: 0001-fix-logo.patch
|
#Patch1: 0001-fix-logo.patch
|
||||||
|
|
||||||
Provides: deepin-appstore-config
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Base files for Deepin Desktop.
|
%{summary}.
|
||||||
|
|
||||||
%package -n deepin-desktop-server
|
%package -n deepin-desktop-server
|
||||||
Summary: Base files for Deepin Desktop
|
BuildArch: noarch
|
||||||
|
Summary: Base files for Deepin Desktop Server
|
||||||
|
Provides: deepin-desktop-base
|
||||||
|
Obsoletes: deepin-desktop-base < %{version}
|
||||||
|
|
||||||
Recommends: deepin-wallpapers
|
Recommends: deepin-wallpapers
|
||||||
Recommends: deepin-screensaver
|
Recommends: deepin-screensaver
|
||||||
|
|
||||||
|
|
||||||
%description -n deepin-desktop-server
|
%description -n deepin-desktop-server
|
||||||
Base files for Deepin Desktop.
|
%{summary}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -n %{name}-%{version}+dde
|
||||||
|
|
||||||
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=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
|
%build
|
||||||
|
# Remove Deepin lsb-release
|
||||||
|
sed -i '/lsb-release/d' Makefile
|
||||||
|
# update lusr/lib/ path
|
||||||
|
sed -i 's|/usr/lib|%{_datadir}|' Makefile
|
||||||
%make_build
|
%make_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
install -d -p %{buildroot}/%{_datadir}/i18n
|
%make_install
|
||||||
install -d -p %{buildroot}/%{_datadir}/python-apt/templates
|
## install distribution.info
|
||||||
install -d -p %{buildroot}/%{_datadir}/deepin/distribution/
|
install -d -p %{buildroot}/%{_datadir}/deepin/distribution/
|
||||||
install -d -p %{buildroot}/%{_sysconfdir}/deepin
|
|
||||||
|
|
||||||
install -Dm644 files/i18n_dependent.json %{buildroot}/%{_datadir}/i18n/i18n_dependent.json
|
|
||||||
install -Dm644 files/language_info.json %{buildroot}/%{_datadir}/i18n/language_info.json
|
|
||||||
install -Dm644 files/logind.conf %{buildroot}/%{_sysconfdir}/systemd/logind.conf.d/logind.conf
|
|
||||||
install -Dm644 files/systemd.conf %{buildroot}/%{_sysconfdir}/systemd/system.conf.d/systemd.conf
|
|
||||||
install -Dm644 files/desktop-version-server %{buildroot}/usr/lib/deepin/desktop-version-server
|
|
||||||
install -Dm644 files/desktop-version %{buildroot}%{_datadir}/deepin/desktop-version
|
|
||||||
install -Dm644 files/appstore.json %{buildroot}/%{_sysconfdir}/appstore.json
|
|
||||||
install -Dm644 files/dde-session-ui.conf %{buildroot}/%{_sysconfdir}/deepin/dde-session-ui.conf
|
|
||||||
install -Dm644 files/deepin-logo.png %{buildroot}/%{_datadir}/plymouth/deepin-logo.png
|
|
||||||
install -Dm644 files/uos_logo.svg %{buildroot}/%{_datadir}/deepin/uos_logo.svg
|
|
||||||
install -Dm644 distribution.info %{buildroot}/%{_datadir}/deepin/distribution.info
|
install -Dm644 distribution.info %{buildroot}/%{_datadir}/deepin/distribution.info
|
||||||
install -Dm644 distribution/*.svg %{buildroot}/%{_datadir}/deepin/distribution/
|
install -Dm644 distribution/*.svg %{buildroot}/%{_datadir}/deepin/distribution/
|
||||||
install -Dm644 files/Deepin.info %{buildroot}/%{_datadir}/python-apt/templates/Deepin.info
|
install -Dm644 files/logind.conf %{buildroot}/%{_sysconfdir}/systemd/logind.conf.d/logind.conf
|
||||||
install -Dm644 files/Deepin.mirrors %{buildroot}/%{_datadir}/python-apt/templates/Deepin.mirrors
|
install -Dm644 files/systemd.conf %{buildroot}/%{_sysconfdir}/systemd/system.conf.d/systemd.conf
|
||||||
install -Dm644 files/dde-desktop-watermask.json %{buildroot}/%{_datadir}/deepin/dde-desktop-watermask.json
|
install -Dm644 files/dde-session-ui.conf %{buildroot}/etc/deepin/dde-session-ui.conf
|
||||||
[ -e files/systemd.conf ] && install -Dm644 files/systemd.conf %{buildroot}/%{_sysconfdir}/systemd/system.conf.d/deepin-base.conf
|
install -Dm644 files/desktop-version-server %{buildroot}%{_datadir}/deepin/desktop-version-server
|
||||||
[ -e files/logind.conf ] && install -Dm644 files/logind.conf %{buildroot}/%{_sysconfdir}/systemd/logind.conf.d/deepin-base.conf
|
ln -sfv %{_datadir}/deepin/desktop-version-server %{buildroot}%{_sysconfdir}/deepin-version
|
||||||
|
|
||||||
|
|
||||||
ln -sfv ..%{_datadir}/deepin/desktop-version %{buildroot}/etc/deepin-version
|
|
||||||
|
|
||||||
%files
|
|
||||||
%config(noreplace) %{_sysconfdir}/appstore.json
|
|
||||||
%{_sysconfdir}/deepin-version
|
|
||||||
%dir %{_datadir}/deepin/
|
|
||||||
%{_sysconfdir}/systemd/logind.conf.d/logind.conf
|
|
||||||
%{_sysconfdir}/systemd/system.conf.d/systemd.conf
|
|
||||||
%{_sysconfdir}/systemd/logind.conf.d/deepin-base.conf
|
|
||||||
%{_sysconfdir}/systemd/system.conf.d/deepin-base.conf
|
|
||||||
%{_datadir}/deepin/desktop-version
|
|
||||||
%{_datadir}/i18n/i18n_dependent.json
|
|
||||||
%{_datadir}/i18n/language_info.json
|
|
||||||
%dir %{_datadir}/plymouth
|
|
||||||
%{_datadir}/plymouth/deepin-logo.png
|
|
||||||
%{_datadir}/python-apt/templates/Deepin.info
|
|
||||||
%{_datadir}/python-apt/templates/Deepin.mirrors
|
|
||||||
%{_datadir}/deepin/dde-desktop-watermask.json
|
|
||||||
%{_datadir}/deepin/uos_logo.svg
|
|
||||||
%{_datadir}/deepin/distribution.info
|
|
||||||
%{_datadir}/deepin/distribution/distribution_logo.svg
|
|
||||||
%{_datadir}/deepin/distribution/distribution_logo_light.svg
|
|
||||||
%{_datadir}/deepin/distribution/distribution_logo_transparent.svg
|
|
||||||
|
|
||||||
%files -n deepin-desktop-server
|
%files -n deepin-desktop-server
|
||||||
%config(noreplace) %{_sysconfdir}/appstore.json
|
%{_sysconfdir}/deepin-version
|
||||||
%config(noreplace) %{_sysconfdir}/deepin/dde-session-ui.conf
|
%{_datadir}/i18n/*.json
|
||||||
/usr/lib/deepin/desktop-version-server
|
%{_datadir}/deepin/distribution.info
|
||||||
%dir %{_datadir}/deepin/
|
%{_datadir}/deepin/distribution/
|
||||||
%{_sysconfdir}/systemd/logind.conf.d/logind.conf
|
%{_datadir}/deepin/desktop-version-server
|
||||||
%{_sysconfdir}/systemd/system.conf.d/systemd.conf
|
%{_sysconfdir}/appstore.json
|
||||||
%{_sysconfdir}/systemd/logind.conf.d/deepin-base.conf
|
|
||||||
%{_sysconfdir}/systemd/system.conf.d/deepin-base.conf
|
|
||||||
%{_datadir}/deepin/desktop-version
|
|
||||||
%{_datadir}/i18n/i18n_dependent.json
|
|
||||||
%{_datadir}/i18n/language_info.json
|
|
||||||
%dir %{_datadir}/plymouth
|
|
||||||
%{_datadir}/plymouth/deepin-logo.png
|
%{_datadir}/plymouth/deepin-logo.png
|
||||||
|
%{_datadir}/deepin/uos_logo.svg
|
||||||
|
%{_sysconfdir}/systemd/system.conf.d/systemd.conf
|
||||||
|
%{_sysconfdir}/systemd/logind.conf.d/logind.conf
|
||||||
%{_datadir}/python-apt/templates/Deepin.info
|
%{_datadir}/python-apt/templates/Deepin.info
|
||||||
%{_datadir}/python-apt/templates/Deepin.mirrors
|
%{_datadir}/python-apt/templates/Deepin.mirrors
|
||||||
%{_datadir}/deepin/dde-desktop-watermask.json
|
%{_datadir}/deepin/dde-desktop-watermask.json
|
||||||
%{_datadir}/deepin/uos_logo.svg
|
%{_sysconfdir}/deepin/dde-session-ui.conf
|
||||||
%{_datadir}/deepin/distribution.info
|
%exclude %{_sysconfdir}/systemd/logind.conf.d/deepin-base.conf
|
||||||
%{_datadir}/deepin/distribution/distribution_logo.svg
|
%exclude %{_sysconfdir}/systemd/system.conf.d/deepin-base.conf
|
||||||
%{_datadir}/deepin/distribution/distribution_logo_light.svg
|
%exclude %{_datadir}/deepin/desktop-version
|
||||||
%{_datadir}/deepin/distribution/distribution_logo_transparent.svg
|
# conflicts with file from package license-config
|
||||||
|
%exclude %{_localstatedir}/uos/os-license
|
||||||
|
%exclude %{_sysconfdir}/os-version
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 20 2021 weidong <weidong@uniontech.com> - 2020.09.11-1
|
||||||
|
- Update 2020.09.11
|
||||||
|
|
||||||
* Sat Jun 05 2021 weidong <weidong@uniontech.com> - 2020.03.23-4
|
* Sat Jun 05 2021 weidong <weidong@uniontech.com> - 2020.03.23-4
|
||||||
- Fix installation dependency errors
|
- Fix installation dependency errors
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
BIN
deepin-desktop-base_2020.09.11.tar.xz
Normal file
BIN
deepin-desktop-base_2020.09.11.tar.xz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user