!52 merge 22.03 next branch

From: @dou33 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2023-05-23 08:49:29 +00:00 committed by Gitee
commit ceaecdadd4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 41 additions and 2 deletions

View File

@ -0,0 +1,34 @@
From 40b2639f0b1a602d07eca393190e705555c4de11 Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Mon, 8 Aug 2022 09:57:56 +0800
Subject: [PATCH] update README.md file
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 2153e55..59d902d 100755
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ UKUI is a desktop environment for Linux distributions and other UNIX-like operat
* ukui-wallpapers (Or ubuntukylin-wallpapers)
### Optional
-* kylin-display-switch
+* kylin-display-switch (No need with ukui-settings-daemon >= 3.1.1)
* ukui-notification-daemon
* ukui-biometric-manager
* ukui-system-monitor
@@ -66,7 +66,7 @@ gsettings set org.mate.interface icon-theme 'ukui-icon-theme'
### Debian unstable (UKUI 3.0)
```
-sudo apt install ukui-session-manager ukui-menu ukui-control-center ukui-settings-daemon ukui-window-switch ukui-media ukui-power-manager peony ukui-themes ukui-greeter kylin-display-switch ukui-sidebar qt5-ukui-platformtheme kylin-nm
+sudo apt install ukui-session-manager ukui-menu ukui-control-center ukui-settings-daemon ukui-window-switch ukui-media ukui-power-manager peony ukui-themes ukui-greeter kylin-display-switch ukui-sidebar qt5-ukui-platformtheme kylin-nm ukui-wallpapers
gsettings set org.mate.interface gtk-theme 'ukui-black'
gsettings set org.ukui.style icon-theme-name 'ukui-icon-theme-default'
```
--
2.33.0

View File

@ -1,7 +1,7 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: ukui-desktop-environment Name: ukui-desktop-environment
Version: 2.0.2 Version: 2.0.2
Release: 15 Release: 16
Summary: ukui-desktop-environment Summary: ukui-desktop-environment
License: GPL-2+ License: GPL-2+
URL: http://www.ukui.org URL: http://www.ukui.org
@ -12,6 +12,7 @@ BuildArch: noarch
patch1: 0001-change-default-gtk-theme-and-icon-theme.patch patch1: 0001-change-default-gtk-theme-and-icon-theme.patch
patch2: 0001-add-components-list-in-README.patch patch2: 0001-add-components-list-in-README.patch
patch3: 0001-Add-ukui-themes-as-alternative-and-drop-eom-et.patch patch3: 0001-Add-ukui-themes-as-alternative-and-drop-eom-et.patch
patch4: 0001-update-README.md-file.patch
Requires: ukui = %{version}-%{release} Requires: ukui = %{version}-%{release}
@ -147,6 +148,7 @@ Enable manual login in UKUI desktop environment
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
@ -175,9 +177,12 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/lightdm/lightdm.conf.d/50-enable-manual-login.conf %{_datadir}/lightdm/lightdm.conf.d/50-enable-manual-login.conf
%changelog %changelog
* Wed Dec 7 2022 douyan <douyan@kylinos.cn> - 2.0.2-15 * Wed Dec 7 2022 douyan <douyan@kylinos.cn> - 2.0.2-16
- add Recommends: ukui-notebook ukui-search ukui-clock - add Recommends: ukui-notebook ukui-search ukui-clock
* Mon Aug 08 2022 tanyulong <tanyulong@kylinos.cn> - 2.0.2-15
- update README.md file
* Tue Mar 8 2022 douyan <douyan@kylinos.cn> - 2.0.2-14 * Tue Mar 8 2022 douyan <douyan@kylinos.cn> - 2.0.2-14
- add ukui-enable-manual-login package - add ukui-enable-manual-login package