desktop

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

ukui-desktop-environment.spec

@@ -1,13 +1,12 @@
 %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
@@ -67,18 +66,11 @@ 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
 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 +87,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)
 
@@ -225,9 +153,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,38 +168,12 @@ 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
-- 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