diff --git a/90_kiran-gc.gschema.override b/90_kiran-gc.gschema.override deleted file mode 100644 index 89c7abc54a33c30a7b67ec9e08df3e5d95db37e9..0000000000000000000000000000000000000000 --- a/90_kiran-gc.gschema.override +++ /dev/null @@ -1,7 +0,0 @@ -[com.kylinsec.kiran.power] -profile-policy='tuned' - -[com.kylinsec.kiran.keyboard] -modifier-lock-enabled=true -capslock-tips-enabled=true -numlock-tips-enabled=true diff --git a/99-disable-xorg-dpms.conf b/99-disable-xorg-dpms.conf new file mode 100644 index 0000000000000000000000000000000000000000..bb0d3a17e08c5c47dca3906c13bb0a1c9d2403ae --- /dev/null +++ b/99-disable-xorg-dpms.conf @@ -0,0 +1,2 @@ +[Seat:*] +xserver-command=X -core -noreset -dpms -s 0 diff --git a/99_kiran-org-mate-NotificationDaemon.gschema.override b/99_kiran-org-mate-NotificationDaemon.gschema.override new file mode 100644 index 0000000000000000000000000000000000000000..b3063bd6d974ac943e09025d24b8d97436b3e1ee --- /dev/null +++ b/99_kiran-org-mate-NotificationDaemon.gschema.override @@ -0,0 +1,2 @@ +[org.mate.NotificationDaemon] +popup-location='top_right' diff --git a/99_kiran-server.gschema.override b/99_kiran-server.gschema.override new file mode 100644 index 0000000000000000000000000000000000000000..0ff835130c3ec2bc5f6e316f229fb8dbd6d092c3 --- /dev/null +++ b/99_kiran-server.gschema.override @@ -0,0 +1,7 @@ +[com.kylinsec.kiran.startmenu.lockdown] +disable-suspend=true +disable-hibernate=true + +[com.kylinsec.kiran.xsettings] +net-icon-theme-name="Summer" +net-theme-name="Kiran-dark" \ No newline at end of file diff --git a/99_unikylin-mate-application-calculator.gschema.override b/99_unikylin-mate-application-calculator.gschema.override deleted file mode 100644 index 540049398d35f2d1cefe5e08db139f2aff507099..0000000000000000000000000000000000000000 --- a/99_unikylin-mate-application-calculator.gschema.override +++ /dev/null @@ -1,3 +0,0 @@ -[org.mate.applications-calculator] -exec='kiran-calculator' - diff --git a/kiran-desktop-2.5.0.tar.gz b/kiran-desktop-2.5.0.tar.gz deleted file mode 100644 index b602fdd8817b6e19eb44edaf9de4495ab1b09fa6..0000000000000000000000000000000000000000 Binary files a/kiran-desktop-2.5.0.tar.gz and /dev/null differ diff --git a/kiran-desktop-2.6.0.tar.gz b/kiran-desktop-2.6.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..665a696b7b2ac6a95b37b44a046efc75d4a81552 Binary files /dev/null and b/kiran-desktop-2.6.0.tar.gz differ diff --git a/kiran-desktop.spec b/kiran-desktop.spec index b398c12c245ca58a44cad12fb193cc51af27e485..d9207c7a3af1134530fe6ca58106011e7e74ffed 100644 --- a/kiran-desktop.spec +++ b/kiran-desktop.spec @@ -1,145 +1,161 @@ %define debug_package %{nil} -Name: kiran-desktop -Version: 2.5.0 -Release: 11 -Summary: Kiran desktop environment +%if %{defined ks_installclass} && "%{ks_installclass}" == "Server" +%define os_type Server +%else +%define os_type Desktop +%endif + +Name: kiran-desktop +Version: 2.6.0 +Release: 7%{?dist} +Summary: Kiran desktop environment #Group: -License: MulanPSL-2.0 -#URL: -Source0: %{name}-%{version}.tar.gz - -# mate specific settings -Source1: 99_unikylin-mate-marco-general-theme.gschema.override -Source2: 99_unikylin-mate-application-calculator.gschema.override -Source3: 90_kiran-gc.gschema.override -Source4: kiran-mimeapps.list - - -%if "%{?kylin}" != "" -Requires: gvfs-fuse -Requires: mate-notification-daemon >= 1.22.0-1 -Requires: mate-media >= 1.22.1-1 -Requires: caja >= 1.22.0-1 -Requires: fcitx >= 4.2.9.6-4 -Requires: gtk3 >= 3.22.30-4 -Requires: kylin-license-core >= 2.2 -Requires: kylin-license-client >= 2.2 -Requires: kylin-license-tool >= 2.2 +License: MulanPSL-2.0 +URL: https://gitee.com/openeuler/kiran-desktop +Source0: %{name}-%{version}.tar.gz + +# 设置Marco默认主题 +Source1: 99_unikylin-mate-marco-general-theme.gschema.override +# 更改Mate Notification 通知位置 +Source2: 99_kiran-org-mate-NotificationDaemon.gschema.override +# 服务器版本定制配置，禁用Xorg screensaver以及DPMS +Source3: 99-disable-xorg-dpms.conf +# 服务器版本GSetting override +Source4: 99_kiran-server.gschema.override +# Kiran Mime Apps +Source5: kiran-mimeapps.list + +%if "%{?kylin}" != "" || "%{?kylinsec}" != "" +Requires: mate-notification-daemon >= 1.22.0-1 +Requires: mate-media >= 1.22.1-1 +Requires: caja >= 1.22.0-1 +Requires: fcitx >= 4.2.9.6-4 +Requires: gtk3 >= 3.22.30-4 +Requires: kylin-license-core >= 2.2 +Requires: kylin-license-client >= 2.2 +Requires: kylin-license-tool >= 2.2 +Requires: kiran-authentication-devices-sdk %else -Requires: gvfs-fuse3 -Requires: mate-notification-daemon -Requires: mate-media -Requires: caja -Requires: caja-open-terminal -Requires: fcitx -Requires: gtk3 -Requires: mate-screenshot +Requires: mate-notification-daemon +Requires: mate-media +Requires: caja +Requires: caja-open-terminal +Requires: fcitx +Requires: gtk3 +Requires: mate-screenshot %endif -%ifnarch loongarch64 sw_64 -Requires: firefox +%ifnarch loongarch64 sw_64 +Requires: firefox +%endif + +Requires: xorg-x11-drivers +Requires: xorg-x11-server-Xorg +Requires: xorg-x11-utils +Requires: xorg-x11-xauth +Requires: xorg-x11-xinit +Requires: mesa-dri-drivers + +Requires: lightdm +Requires: lightdm-gobject + +Requires: NetworkManager +Requires: NetworkManager-adsl +Requires: NetworkManager-ovs +Requires: NetworkManager-ppp +Requires: NetworkManager-team +Requires: NetworkManager-wwan +Requires: nm-connection-editor + +Requires: adwaita-gtk2-theme +Requires: google-noto-cjk-fonts + +Requires: alsa-plugins-pulseaudio +Requires: dconf +Requires: dconf-editor +Requires: flatpak + +Requires: gvfs +Requires: gvfs-afc +Requires: gvfs-afp +Requires: gvfs-archive +Requires: gvfs-gphoto2 +Requires: gvfs-mtp +Requires: gvfs-smb + +%if (("%{?kylin}" != "") && (0%{?ks_minor_version} >= 5)) || "%{?openEuler}" != "" +Requires: gvfs-fuse3 +%else +Requires: gvfs-fuse %endif -Requires: xorg-x11-drivers -Requires: xorg-x11-server-Xorg -Requires: xorg-x11-utils -Requires: xorg-x11-xauth -Requires: xorg-x11-xinit -Requires: mesa-dri-drivers - -Requires: lightdm -Requires: lightdm-gobject - -Requires: NetworkManager -Requires: NetworkManager-adsl -Requires: NetworkManager-ovs -Requires: NetworkManager-ppp -Requires: NetworkManager-team -Requires: NetworkManager-wwan -Requires: nm-connection-editor - -Requires: adwaita-gtk2-theme -Requires: google-noto-cjk-fonts -Requires: dejavu-fonts - -Requires: alsa-plugins-pulseaudio -Requires: dconf -Requires: dconf-editor -Requires: flatpak - -Requires: gvfs -Requires: gvfs-afc -Requires: gvfs-afp -Requires: gvfs-archive -Requires: gvfs-gphoto2 -Requires: gvfs-mtp -Requires: gvfs-smb - -Requires: mate-desktop -Requires: mate-menus - -Requires: kwin -Requires: marco -Requires: engrampa -Requires: atril -Requires: pluma -Requires: eom -Requires: mate-settings-daemon -Requires: mate-user-guide -Requires: mate-menus-preferences-category-menu -Requires: mate-terminal -Requires: libmatekbd -Requires: libmatemixer -Requires: libmateweather -Requires: yelp -Requires: libsecret -Requires: lm_sensors -Requires: gnome-disk-utility -Requires: firewall-config - -Requires: ntfs-3g -Requires: ntfsprogs -Requires: pavucontrol -Requires: setroubleshoot -Requires: system-config-printer -Requires: fcitx-qt5 -Requires: fcitx-configtool -Requires: glx-utils -Requires: initial-setup-gui -Requires: plymouth-system-theme - -Requires: p7zip -Requires: xdg-user-dirs-gtk -Requires: vim-enhanced -Requires: spice-vdagent - -Requires: kiran-authentication-service >= 2.5 -Requires: kiran-authentication-devices >= 2.5 -Requires: kiran-session-manager >= 2.5 -Requires: kiran-control-panel >= 2.5 -Requires: kiran-cpanel-launcher >= 2.4 -Requires: kiran-cc-daemon-common >= 2.5 -Requires: kiran-session-daemon >= 2.5 -Requires: kiran-system-daemon >= 2.5 -Requires: kiran-log-gtk3 >= 2.4 -Requires: kiran-log-qt5 >= 2.4 -Requires: kiran-widgets-qt5 >= 2.4 -Requires: kiran-calculator >= 2.3 -Requires: kiran-gtk-theme >= 2.3 -Requires: kiran-screensaver-dialog >= 2.5 -Requires: kiran-polkit-agent >= 2.5 -Requires: lightdm-kiran-greeter >= 2.5 -Requires: kiran-screensaver >= 2.2 -Requires: kiran-applets >= 2.2.6-4 -Requires: kiran-calendar >= 2.2 -Requires: kiran-icon-theme >= 2.5 -Requires: kiran-flameshot -Requires: kiran-wallpapers -Requires: kiran-themes -Requires: kiran-panel -Requires: kiran-panel-libs - -Obsoletes: kiran-cpanel-menu +Requires: mate-desktop +Requires: mate-menus + +Requires: kwin +Requires: marco +Requires: engrampa +Requires: atril +Requires: pluma +Requires: eom +Requires: mate-settings-daemon +Requires: mate-user-guide +Requires: mate-menus-preferences-category-menu +Requires: mate-terminal +Requires: libmatekbd +Requires: libmatemixer +Requires: libmateweather +Requires: yelp +Requires: libsecret +Requires: lm_sensors +Requires: gnome-disk-utility +Requires: firewall-config + +Requires: ntfs-3g +Requires: ntfsprogs +Requires: pavucontrol +Requires: setroubleshoot +Requires: system-config-printer +Requires: fcitx-qt5 +Requires: fcitx-configtool +Requires: glx-utils +Requires: initial-setup-gui +Requires: plymouth-system-theme + +Requires: p7zip +Requires: xdg-user-dirs-gtk +Requires: vim-enhanced +Requires: spice-vdagent +Requires: kf5-kconfig +Requires: libqtxdg + +Requires: kiran-authentication-service >= 2.5 +Requires: kiran-authentication-devices >= 2.5 +Requires: kiran-session-manager >= 2.5 +Requires: kiran-control-panel >= 2.6 +Requires: kiran-cpanel-launcher >= 2.6 +Requires: kiran-cc-daemon-common >= 2.6 +Requires: kiran-session-daemon >= 2.6 +Requires: kiran-system-daemon >= 2.6 +Requires: kiran-log-gtk3 >= 2.4 +Requires: kiran-log-qt5 >= 2.4 +Requires: kiran-widgets-qt5 >= 2.4 +Requires: kiran-calculator >= 2.3 +Requires: kiran-gtk-theme >= 2.6 +Requires: kiran-screensaver-dialog >= 2.5 +Requires: kiran-polkit-agent >= 2.5 +Requires: lightdm-kiran-greeter >= 2.5 +Requires: kiran-screensaver >= 2.2 +Requires: kiran-applets >= 2.6 +Requires: kiran-calendar >= 2.3 +Requires: kiran-icon-theme >= 2.6 +Requires: kiran-flameshot +Requires: kiran-wallpapers +Requires: kiran-panel +Requires: kiran-panel-libs +Requires: kiran-manual + +Obsoletes: kiran-cpanel-menu %description Kiran desktop environment @@ -152,16 +168,28 @@ Kiran desktop environment %install mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/ cp %{_builddir}/%{name}-%{version}/RELEASE.md %{buildroot}/%{_datadir}/doc/%{name}/ - install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/99_unikylin-mate-marco-general-theme.gschema.override -install -D -m 0644 %SOURCE2 %{buildroot}%{_datadir}/glib-2.0/schemas/99_unikylin-mate-application-calculator.gschema.override -%if "%{ks_custom_name}" == "GC" -install -D -m 0644 %SOURCE3 %{buildroot}%{_datadir}/glib-2.0/schemas/90_kiran-gc.gschema.override +install -D -m 0644 %SOURCE2 %{buildroot}%{_datadir}/glib-2.0/schemas/99_kiran-org-mate-NotificationDaemon.gschema.override +%if "%{os_type}" == "Server" +## 安装针对服务器版本禁用相应的电源配置 +install -D -m 0644 %SOURCE3 %{buildroot}%{_datadir}/lightdm/lightdm.conf.d/99-disable-xorg-dpms.conf +install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/glib-2.0/schemas/99_kiran-server.gschema.override %endif -install -D -m 0644 %SOURCE4 %{buildroot}%{_datadir}/applications/kiran-mimeapps.list +install -D -m 0644 %SOURCE5 %{buildroot}%{_datadir}/applications/kiran-mimeapps.list + %post /usr/bin/update-desktop-database &> /dev/null || : +%if "%{os_type}" == "Server" +## 禁用greeter/screensaver的休眠/待机 +sed -i "s/can-suspend=true/can-suspend=false/g" %{_datadir}/lightdm-kiran-greeter/greeter.ini +sed -i "s/can-hibernate=true/can-hibernate=false/g" %{_datadir}/lightdm-kiran-greeter/greeter.ini +sed -i "s/can-suspend=true/can-suspend=false/g" %{_datadir}/kiran-screensaver-dialog/screensaver.ini +sed -i "s/can-hibernate=true/can-hibernate=false/g" %{_datadir}/kiran-screensaver-dialog/screensaver.ini +## 禁用控制中心前后端的电源插件 +sed -i "/\[power\]/,/Available=true/s/Available=true/Available=false/g" %{_libdir}/kiran-cc-daemon/session/plugin_options +mv %{_datadir}/kiran-control-panel/category/desktop/power-management.desktop %{_datadir}/kiran-control-panel/category/desktop/power-management.desktop.disable +%endif %postun /usr/bin/update-desktop-database &> /dev/null || : @@ -174,15 +202,49 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null || : %{_datadir}/doc/%{name}/RELEASE.md %{_datadir}/applications/kiran-mimeapps.list %{_datadir}/glib-2.0/schemas/99_unikylin-mate-marco-general-theme.gschema.override -%{_datadir}/glib-2.0/schemas/99_unikylin-mate-application-calculator.gschema.override - -%if "%{ks_custom_name}" == "GC" -%{_datadir}/glib-2.0/schemas/90_kiran-gc.gschema.override +%{_datadir}/glib-2.0/schemas/99_kiran-org-mate-NotificationDaemon.gschema.override +%if "%{os_type}" == "Server" +%{_datadir}/lightdm/lightdm.conf.d/99-disable-xorg-dpms.conf +%{_datadir}/glib-2.0/schemas/99_kiran-server.gschema.override %endif %changelog +* Sun Apr 07 2024 liuxinhao - 2.6.0-7 +- KYOS-F: kylinsec-server set default theme to kiran-dark +- KYOS-B: remove dependencies(kiran-themes),change dependencies(gvfs-fuse3) + +* Wed Mar 27 2024 liuxinhao - 2.6.0-6 +- KYOS-F: set Summer as the default icon theme for server(#31786) + +* Wed Mar 27 2024 liuxinhao - 2.6.0-5 +- KYOS-F: Disable power management for server versions(#31787) + +* Tue Mar 05 2024 luoqing - 2.6.0-4.kb1 +- KYOS-F: change the default location of the popup notification to the top right (#30919) + +* Fri Feb 23 2024 liuxinhao - 2.6.0-3.kb2 +- KYOS-B: adapt to kylinsec marcos + +* Fri Jan 19 2024 liuxinhao - 2.6.0-3.kb1 +- KYOS-B: fix issue of failed pull dependency gvfs-fuse + +* Thu Jan 18 2024 luoqing - 2.6.0-2.kb1 +- KYOS-F: update some dependent component version to 2.6 + +* Mon Dec 18 2023 liuxinhao - 2.6.0-1.kb1 +- KYOS-F: release 2.6.0 + +* Wed Dec 06 2023 liuxinhao - 2.5.1-2.kb5 +- KYBD: rebuild for KiranUI-2.6-next + +* Wed Sep 13 2023 liuxinhao - 2.5.1-2.kb1 +- KYBD: rebuild for KiranUI-2.5-next + +* Wed Sep 13 2023 liuxinhao - 2.5.1-2 +- KYBD: remove Require dejavu-fonts + * Tue Jul 25 2023 liuxinhao - 2.5.1-1 -- KYOS-F: add kiran-mimeapps.list file,add require atril(#10298) +- KYOS-F: add kiran-mimeapps.list file,add require atril(#10298) * Mon Jul 10 2023 meizhigang - 2.5.0-10 - KYOS-F: Add kiran gschema override for GC (#9113 #9379)