From 32b47aba868bd8e859527ce49ef385ba181d456a Mon Sep 17 00:00:00 2001 From: kylinsecos_admin Date: Mon, 24 Jan 2022 11:26:46 +0800 Subject: [PATCH 1/2] remove the Requires: kylin-license in openeuler --- kiran-desktop.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/kiran-desktop.spec b/kiran-desktop.spec index 367d144..d92398f 100644 --- a/kiran-desktop.spec +++ b/kiran-desktop.spec @@ -3,7 +3,7 @@ Name: kiran-desktop Version: 2.2 -Release: 6.kb2 +Release: 6.kb3 Summary: Kiran desktop environment #Group: @@ -135,9 +135,14 @@ Requires: kiran-panel Requires: kiran-panel-libs Requires: kiran-applets >= 2.2.6-4 kiran-applets < 2.3 Requires: kiran-calendar >= 2.2 kiran-calendar < 2.3 -Requires: kylin-license-core >= 2.2 kylin-license-core < 2.4 -Requires: kylin-license-client >= 2.2 kylin-license-client < 2.4 -Requires: kylin-license-tool >= 2.2 kylin-license-tool < 2.4 +%if 0%{?on_openeuler} +#Requires: kylin-license-core >= 2.2 kylin-license-core < 2.4 +#Requires: kylin-license-client >= 2.2 kylin-license-client < 2.4 +#Requires: kylin-license-tool >= 2.2 kylin-license-tool < 2.4 +%else +Requires: kylin-license-core >= 2.2 kylin-license-core < 2.4 +Requires: kylin-license-client >= 2.2 kylin-license-client < 2.4 +Requires: kylin-license-tool >= 2.2 kylin-license-tool < 2.4 Obsoletes: kiran-cpanel-menu @@ -169,6 +174,9 @@ done %changelog +* 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. From d91467ecfa6e76df8794f2788e2910874b206e64 Mon Sep 17 00:00:00 2001 From: kylinsecos_admin Date: Mon, 24 Jan 2022 14:48:12 +0800 Subject: [PATCH 2/2] Add %endif in spec --- kiran-desktop.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/kiran-desktop.spec b/kiran-desktop.spec index d92398f..322d246 100644 --- a/kiran-desktop.spec +++ b/kiran-desktop.spec @@ -143,6 +143,7 @@ Requires: kiran-calendar >= 2.2 kiran-calendar < 2.3 Requires: kylin-license-core >= 2.2 kylin-license-core < 2.4 Requires: kylin-license-client >= 2.2 kylin-license-client < 2.4 Requires: kylin-license-tool >= 2.2 kylin-license-tool < 2.4 +%endif Obsoletes: kiran-cpanel-menu