From ca4c0f89f3f51e36dfb1867c672dace3d996810a Mon Sep 17 00:00:00 2001 From: peijiankang Date: Thu, 7 Sep 2023 16:17:02 +0800 Subject: [PATCH] add desktop (cherry picked from commit b06bd03862ca53313fd6afca376b2726a4eafbfc) --- desktop | 1 + ukui-desktop-environment.spec | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 desktop diff --git a/desktop b/desktop new file mode 100644 index 0000000..2164245 --- /dev/null +++ b/desktop @@ -0,0 +1 @@ +DESKTOP="UKUI" diff --git a/ukui-desktop-environment.spec b/ukui-desktop-environment.spec index 2c1e99d..8417be3 100644 --- a/ukui-desktop-environment.spec +++ b/ukui-desktop-environment.spec @@ -1,12 +1,13 @@ %define debug_package %{nil} Name: ukui-desktop-environment Version: 2.0.2 -Release: 18 +Release: 19 Summary: ukui-desktop-environment License: GPL-2+ URL: http://www.ukui.org Source0: ukui-desktop-environment-2.0.2.tar.gz Source1: 50-enable-manual-login.conf +Source2: desktop BuildArch: noarch patch1: 0001-change-default-gtk-theme-and-icon-theme.patch @@ -121,6 +122,7 @@ Requires: qt5-qtgraphicaleffects Requires: ubuntukylin-default-settings Requires: engrampa Requires: shotwell +Requires: kylin-photo-viewer Requires: atril Requires: ukui-kwin Requires: google-noto-sans-cjk-ttc-fonts @@ -223,6 +225,9 @@ Enable manual login in UKUI desktop environment mkdir -p %{buildroot}/usr/share/lightdm/lightdm.conf.d/ cp -r %{SOURCE1} %{buildroot}/usr/share/lightdm/lightdm.conf.d/ +mkdir -p %{buildroot}/etc/sysconfig +cp -r %{SOURCE2} %{buildroot}/etc/sysconfig + %clean rm -rf $RPM_BUILD_ROOT @@ -241,12 +246,19 @@ rm -rf $RPM_BUILD_ROOT %files -n ukui-server %doc debian/copyright debian/changelog +%{_sysconfdir}/sysconfig/desktop %files -n ukui-enable-manual-login %doc debian/copyright debian/changelog %{_datadir}/lightdm/lightdm.conf.d/50-enable-manual-login.conf %changelog +* Mon Jun 19 2023 peijiankang - 2.0.2-19 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: add desktop + * Fri Jun 16 2023 douyan - 2.0.2-18 - add package ukui-server -- Gitee