0001-update-README.md-file.patch

@@ -1,34 +0,0 @@
-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
-

desktop

@@ -1 +0,0 @@
-DESKTOP="UKUI"

ukui-desktop-environment.spec

@@ -1,19 +1,17 @@
 %define debug_package %{nil}
 Name:           ukui-desktop-environment
 Version:        2.0.2
-Release:        20
+Release:        15
 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
 patch2: 	0001-add-components-list-in-README.patch
 patch3:		0001-Add-ukui-themes-as-alternative-and-drop-eom-et.patch
-patch4:		0001-update-README.md-file.patch
 
 Requires: ukui = %{version}-%{release}
 
@@ -67,7 +65,7 @@ Recommends: ukui-notification-daemon
 Recommends: pluma
 Recommends: blueman
 Recommends: kylin-screenshot
-Recommends: kylin-weather
+Recommends: indicator-china-weather
 Recommends: kylin-calculator
 Recommends: kylin-video
 Recommends: fcitx fcitx-configtool fcitx-qt5
@@ -75,10 +73,6 @@ Recommends: kylin-music system-config-printer
 Recommends: ukui-notebook
 Recommends: ukui-search
 Recommends: ukui-clock
-Recommends: kylin-user-guide
-#Recommends: ukylin-feedback-client
-Recommends: dejavu-fonts
-Recommends: xorg-x11-fonts-others
 
 BuildArch: noarch
 
@@ -95,70 +89,6 @@ The UKUI Desktop Environment is the continuation of MATE. It provides an
  UKUI file manager (Peony), the UKUI control center and a limited set of
  other obligatory UKUI desktop components.
 
-%package -n ukui-server
-Summary:        ukui-desktop-environment
-
-Requires: ukui-greeter
-Requires: ukui-control-center
-Requires: qt5-ukui-platformtheme
-Requires: ukui-menu
-Requires: ukui-panel
-Requires: ukui-polkit
-Requires: ukui-power-manager
-Requires: ukui-screensaver
-Requires: ukui-session-manager
-Requires: ukui-settings-daemon
-Requires: ukui-sidebar
-Requires: ukui-themes
-Requires: ukui-wallpapers
-Requires: ukui-system-monitor
-Requires: ukui-window-switch
-Requires: peony
-Requires: peony-extensions
-Requires: kylin-nm
-Requires: ukui-media
-Requires: qt5-qtquickcontrols
-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
-Requires: kylin-user-guide
-Requires: system-config-printer
-
-Recommends: firefox
-Recommends: time-shutdown
-Recommends: kylin-display-switch
-Recommends: ukui-notification-daemon
-Recommends: pluma
-Recommends: kylin-screenshot
-Recommends: kylin-calculator
-Recommends: fcitx fcitx-configtool fcitx-qt5
-Recommends: ukui-search
-Recommends: dejavu-fonts
-Recommends: xorg-x11-fonts-others
-
-
-
-BuildArch: noarch
-
-%description -n ukui-server
-The UKUI Desktop Environment is the continuation of MATE. It provides an
- intuitive and attractive desktop environment using traditional metaphors for
- Linux and other Unix-like operating systems.
- .
- UKUI is under active development to add support for new technologies while
- preserving a traditional desktop experience.
- .
- This package depends on a very basic set of programs that are necessary to
- start a UKUI desktop environment session. The set of programs includes the
- UKUI file manager (Peony), the UKUI control center and a limited set of
- other obligatory UKUI desktop components.
-
-
 %package core
 Summary:	UKUI Desktop Environment (essential components, metapackage)
 
@@ -217,7 +147,6 @@ Enable manual login in UKUI desktop environment
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 
@@ -225,9 +154,6 @@ 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
 
@@ -243,41 +169,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ukui
 %doc debian/copyright debian/changelog
-%{_sysconfdir}/sysconfig/desktop
-
-%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
-* Fri Nov 17 2023 peijiankang <peijiankang@kylinos.cn> - 2.0.2-20
+* Wed Dec 7 2022 douyan <douyan@kylinos.cn> - 2.0.2-15
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: add desktop for ukui
-
-* Mon Jun 19 2023 peijiankang <peijiankang@kylinos.cn> - 2.0.2-19
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: add desktop
-
-* Fri Jun 16 2023 douyan <douyan@kylinos.cn> - 2.0.2-18
-- add package ukui-server
-
-* Sun Jun 11 2023 douyan <douyan@kylinos.cn> - 2.0.2-17
-- add Recommends: kylin-weather kylin-user-guide
-
-* Wed Dec 7 2022 douyan <douyan@kylinos.cn> - 2.0.2-16
 - 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
 - add ukui-enable-manual-login package