diff --git a/kiran-desktop-2.5.0.tar.gz b/kiran-desktop-2.5.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9f8baa58806f9a1f68120e9f88b82e57533cb2d4 Binary files /dev/null and b/kiran-desktop-2.5.0.tar.gz differ diff --git a/kiran-desktop-2.5.tar.gz b/kiran-desktop-2.5.tar.gz deleted file mode 100644 index 4c36966e8d43a2c2fd2384e5f8f15449257e0576..0000000000000000000000000000000000000000 Binary files a/kiran-desktop-2.5.tar.gz and /dev/null differ diff --git a/kiran-desktop.spec b/kiran-desktop.spec index 0dce0999cded995747f5abb4f0381e8d9b3445da..f5495286a42acc4074c34d3f5adfd15ec6e2ca26 100644 --- a/kiran-desktop.spec +++ b/kiran-desktop.spec @@ -1,8 +1,7 @@ %define debug_package %{nil} - Name: kiran-desktop -Version: 2.5 -Release: 1 +Version: 2.5.0 +Release: 2 Summary: Kiran desktop environment #Group: License: MulanPSL-2.0 @@ -22,7 +21,7 @@ Requires: xorg-x11-xinit Requires: mesa-dri-drivers -%if 0%{?kylin} +%if "%{?kylin}" != "" Requires: gtk3 >= 3.22.30-4%{?dist}.kb6 %else Requires: gtk3 @@ -52,7 +51,7 @@ Requires: gvfs Requires: gvfs-afc Requires: gvfs-afp Requires: gvfs-archive -%if 0%{?kylin} +%if "%{?kylin}" != "" Requires: gvfs-fuse %else Requires: gvfs-fuse3 @@ -63,17 +62,17 @@ Requires: gvfs-smb Requires: mate-desktop Requires: mate-menus -%if 0%{?kylin} +%if "%{?kylin}" != "" Requires: mate-notification-daemon >= 1.22.0-1%{?dist}.kb7 %else Requires: mate-notification-daemon %endif -%if 0%{?kylin} +%if "%{?kylin}" != "" Requires: mate-media >= 1.22.1-1%{?dist}.kb8 %else Requires: mate-media %endif -%if 0%{?kylin} +%if "%{?kylin}" != "" Requires: caja >= 1.22.0-1%{?dist}.kb36 %else Requires: caja @@ -103,7 +102,7 @@ Requires: ntfsprogs Requires: pavucontrol Requires: setroubleshoot Requires: system-config-printer -%if 0%{?kylin} +%if "%{?kylin}" != "" Requires: fcitx >= 4.2.9.6-4%{?dist}.kb10 %else Requires: fcitx @@ -145,7 +144,7 @@ Requires: kiran-themes Requires: kiran-panel Requires: kiran-panel-libs -%if 0%{?kylin} +%if "%{?kylin}" != "" Requires: kylin-license-core >= 2.2 Requires: kylin-license-client >= 2.2 Requires: kylin-license-tool >= 2.2 @@ -184,80 +183,8 @@ install -D -m 0644 %SOURCE1 %{buildroot}%{_datadir}/glib-2.0/schemas/99_unikylin %changelog -* Thu Apr 20 2023 luoqing - 2.5-1 -- kYOS-F: update to kiran-desktop-2.5 - -* Mon Dec 05 2022 liuxinhao - 2.4-3 -- kYOS-F: after install update-desktop-database - -* Mon Nov 14 2022 liuxinhao - 2.4-2 -- KYOS-F: add Requres: firefox,eom,dejavu-fonts - -* Fri Nov 04 2022 liuxinhao - 2.4-1 -- KYOS-F: RELEASE kiran-desktop 2.4 - -* Mon Aug 22 2022 liuxinhao - 2.3-4 -- KYOS-F: add depenency: caja-open-terminal - -* Mon Aug 08 2022 luoqing - 2.3-3 -- KYOS-F: Modify license. -- KYOS-F: Add yaml file. - -* Mon Jul 25 2022 liuxinhao - 2.3-2 -- KYOS-F: add depenency: mate-polkit,fcitx-configtool - -* Mon Jul 11 2022 liuxinhao - 2.3-1 -- KYOS-F: RELEASE kiran-desktop 2.3 - -* Wed Jun 29 2022 yuanxing - 2.2-11 -- KYOS-F: change the default marco theme to Kiran-dark - -* Tue Mar 15 2022 longcheng - 2.2-10 -- KYOS-B: fix spec error - -* Mon Mar 14 2022 longcheng - 2.2-9 -- KYOS-B: Add Requires fcitx-qt5 -- KYOS-B: Remove post scripts and postun scripts - -* Mon Feb 28 2022 longcheng - 2.2-8 -- KYOS-B: remove Requires zint -- KYOS-B: remove Requires firefox for KY3.4-3-LS +* Thu Apr 20 2023 wangyucheng - 2.5.0-2 +- kYOS-F: Fix when %kylin is 3_*, Unable to run rpmbuild - bs -* Thu Feb 24 2022 chendingjian - 2.2-7 -- rebuild for KY3.4-MATE-modules-dev - -* Wed Jan 26 2022 longcheng - 2.2-6.kb4 -- KYOS-B: remove and modify some Requires in openeuler - -* Mon Jan 24 2022 longcheng - 2.2-6.kb3 -- KYOS-B: remove the Requires: kylin-license in openeuler - -* Wed Jan 19 2022 tangjie02 - 2.2-6.kb2 -- KYOS-F: Modify the max require version of kylin-license to 2.4. - -* Mon Jan 17 2022 longcheng - 2.2-5.kb2 -- KYOS-F: fix desktop icon theme is not Kiran (#49251) - -* Wed Dec 29 2021 kpkg - 2.2-5.kb1 -- rebuild for KY3.4-MATE-modules-dev - -* Wed Dec 29 2021 caoyuanji - 2.2-5 -- Upgrade version number for easy upgrade - -* Tue Dec 28 2021 caoyuanji - 2.2-4.kb1 -- rebuild for KY3.4-4-KiranUI-2.2 - -* Tue Nov 23 2021 tangjie02 2.2-4.ky3 -- KYOS-B: Remove kiran-cpanel-menu from require packages. - -* Tue Nov 23 2021 tangjie02 2.2-3.ky3 -- KYOS-B: Add new Requires. - -* Mon Nov 22 2021 tangjie02 2.2-2.ky3 -- KYOS-B: Restricted version for requires packages. - -* Mon Nov 22 2021 tangjie02 2.2-1.ky3 -- KYOS-F: New KiranUI2.2 - -* Tue Oct 26 2021 xiewenhao 2.1-1.ky3 -- KYOS：create kiran-desktop +* Thu Apr 20 2023 luoqing - 2.5.0-1 +- kYOS-F: update to kiran-desktop-2.5