diff --git a/0001-fix-logo.patch b/0001-fix-logo.patch index b00631fb75c3e5d4af30672913ffe50efc6e5d7f..a51e0f0f6a152efdac3905dd402c5b861db2710a 100644 --- a/0001-fix-logo.patch +++ b/0001-fix-logo.patch @@ -1,25 +1,25 @@ -From 8e931f32cefcd999f310f2ba60114a8e1aa1353a Mon Sep 17 00:00:00 2001 -From: weidong -Date: Fri, 4 Dec 2020 17:43:32 +0800 +From 3d1b6cd56dda9190a4c5911cbeb0556d30ef0c59 Mon Sep 17 00:00:00 2001 +From: wei dong +Date: Mon, 12 Jul 2021 17:01:25 +0800 Subject: [PATCH] fix logo --- distribution/distribution_logo.svg | 20 ++++---- distribution/distribution_logo_light.svg | 18 +++---- - .../distribution_logo_transparent.svg | 31 +++++------- - files/uos_logo.svg | 49 +++++++++---------- + .../distribution_logo_transparent.svg | 31 ++++------- + files/uos_logo.svg | 51 +++++++++---------- files/watermark_logo.svg | 24 --------- - 5 files changed, 54 insertions(+), 88 deletions(-) + 5 files changed, 53 insertions(+), 91 deletions(-) delete mode 100644 files/watermark_logo.svg diff --git a/distribution/distribution_logo.svg b/distribution/distribution_logo.svg -index 5766b25..1cfa2bb 100644 +index 54203a1..1cfa2bb 100644 --- a/distribution/distribution_logo.svg +++ b/distribution/distribution_logo.svg @@ -1,12 +1,10 @@ -- +- - -- +- - - - @@ -27,7 +27,7 @@ index 5766b25..1cfa2bb 100644 - - - -- +- + + + @@ -39,14 +39,14 @@ index 5766b25..1cfa2bb 100644 + diff --git a/distribution/distribution_logo_light.svg b/distribution/distribution_logo_light.svg -index 46f3a20..f9568fc 100644 +index a8791c1..f9568fc 100644 --- a/distribution/distribution_logo_light.svg +++ b/distribution/distribution_logo_light.svg @@ -1,12 +1,12 @@ -- +- + -- +- - - - @@ -55,7 +55,7 @@ index 46f3a20..f9568fc 100644 - + -- +- + + + @@ -65,27 +65,29 @@ index 46f3a20..f9568fc 100644 + diff --git a/distribution/distribution_logo_transparent.svg b/distribution/distribution_logo_transparent.svg -index 5851a5e..96d9140 100644 +index be2e957..96d9140 100644 --- a/distribution/distribution_logo_transparent.svg +++ b/distribution/distribution_logo_transparent.svg -@@ -1,25 +1,18 @@ -- +@@ -1,27 +1,18 @@ +- + -- +- - -- -- -- -- -- +- +- +- +- +- +- +- - + + + -- -- +- +- - - - @@ -98,32 +100,33 @@ index 5851a5e..96d9140 100644 + -- -- -- +- + -+ + +- + diff --git a/files/uos_logo.svg b/files/uos_logo.svg -index 5851a5e..1eff751 100644 +index be2e957..1eff751 100644 --- a/files/uos_logo.svg +++ b/files/uos_logo.svg -@@ -1,25 +1,24 @@ -- +@@ -1,27 +1,24 @@ +- - -- +- - -- -- -- -- -- +- +- +- +- +- +- +- - - -- -- +- +- - - - @@ -131,9 +134,9 @@ index 5851a5e..1eff751 100644 - - - -- -- -- +- +- +- - - + @@ -193,5 +196,5 @@ index 1eff751..0000000 - \ No newline at end of file -- -2.18.4 +2.27.0 diff --git a/deepin-desktop-base.spec b/deepin-desktop-base.spec index ad3d6471539ae59d5e590c25dae751b08f44e265..5731a7ae0d6fcae158d8bdf5f90f081c14bc00ff 100644 --- a/deepin-desktop-base.spec +++ b/deepin-desktop-base.spec @@ -1,113 +1,76 @@ Name: deepin-desktop-base -Version: 2020.03.23 -Release: 4 +Version: 2020.09.11 +Release: 1 Summary: Base files for Deepin Desktop License: GPLv3 URL: https://github.com/linuxdeepin/deepin-desktop-base -Source0: %{name}_%{version}.orig.tar.xz +Source0: %{url}/archive/%{version}/%{name}_%{version}.tar.xz BuildArch: noarch -Patch1: 0001-fix-logo.patch - -Provides: deepin-appstore-config - +#Patch1: 0001-fix-logo.patch %description -Base files for Deepin Desktop. +%{summary}. + +%package -n deepin-desktop-server +BuildArch: noarch +Summary: Base files for Deepin Desktop Server +Provides: deepin-desktop-base +Obsoletes: deepin-desktop-base < %{version} -%package -n deepin-desktop-server -Summary: Base files for Deepin Desktop Recommends: deepin-wallpapers Recommends: deepin-screensaver - -%description -n deepin-desktop-server -Base files for Deepin Desktop. +%description -n deepin-desktop-server +%{summary}. %prep -%autosetup -p1 - -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} - +%autosetup -n %{name}-%{version}+dde %build +# Remove Deepin lsb-release +sed -i '/lsb-release/d' Makefile +# update lusr/lib/ path +sed -i 's|/usr/lib|%{_datadir}|' Makefile %make_build %install -install -d -p %{buildroot}/%{_datadir}/i18n -install -d -p %{buildroot}/%{_datadir}/python-apt/templates +%make_install +## install distribution.info 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/*.svg %{buildroot}/%{_datadir}/deepin/distribution/ -install -Dm644 files/Deepin.info %{buildroot}/%{_datadir}/python-apt/templates/Deepin.info -install -Dm644 files/Deepin.mirrors %{buildroot}/%{_datadir}/python-apt/templates/Deepin.mirrors -install -Dm644 files/dde-desktop-watermask.json %{buildroot}/%{_datadir}/deepin/dde-desktop-watermask.json -[ -e files/systemd.conf ] && install -Dm644 files/systemd.conf %{buildroot}/%{_sysconfdir}/systemd/system.conf.d/deepin-base.conf -[ -e files/logind.conf ] && install -Dm644 files/logind.conf %{buildroot}/%{_sysconfdir}/systemd/logind.conf.d/deepin-base.conf - +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/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 -ln -sfv ..%{_datadir}/deepin/desktop-version %{buildroot}/etc/deepin-version -%files -%config(noreplace) %{_sysconfdir}/appstore.json +%files -n deepin-desktop-server %{_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}/i18n/*.json +%{_datadir}/deepin/distribution.info +%{_datadir}/deepin/distribution/ +%{_datadir}/deepin/desktop-version-server +%{_sysconfdir}/appstore.json %{_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 -%config(noreplace) %{_sysconfdir}/appstore.json -%config(noreplace) %{_sysconfdir}/deepin/dde-session-ui.conf -/usr/lib/deepin/desktop-version-server -%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 +%{_sysconfdir}/systemd/logind.conf.d/logind.conf %{_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 +%{_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 %{_datadir}/deepin/desktop-version +# conflicts with file from package license-config +%exclude %{_localstatedir}/uos/os-license +%exclude %{_sysconfdir}/os-version %changelog +* Tue Jul 20 2021 weidong - 2020.09.11-1 +- Update 2020.09.11 + * Sat Jun 05 2021 weidong - 2020.03.23-4 - Fix installation dependency errors diff --git a/deepin-desktop-base_2020.03.23.orig.tar.xz b/deepin-desktop-base_2020.03.23.orig.tar.xz deleted file mode 100644 index 6bd984e3968198069b35b7d2dc3c38e2c091c676..0000000000000000000000000000000000000000 Binary files a/deepin-desktop-base_2020.03.23.orig.tar.xz and /dev/null differ diff --git a/deepin-desktop-base_2020.09.11.tar.xz b/deepin-desktop-base_2020.09.11.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..1fa30ea48c0648fa3b7157525511ac35718e6a2f Binary files /dev/null and b/deepin-desktop-base_2020.09.11.tar.xz differ