From efe76a2e3b5456a0126dd6a749d358b1aa160681b430987ab2e8d68f0ba8bc6f Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 22 Sep 2023 14:23:14 +0000 Subject: [PATCH] Accepting request 1112809 from home:qzhao:branches:M17N Update brise.spec * Add Conflicts condition to insure brise could update successfully from brise binary rpm, for SUSE:SLE-SP6 update. * Replace rime-schema-all dependence to real package name to avoid 2 level of virtual packages when it installed. OBS-URL: https://build.opensuse.org/request/show/1112809 OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=22 --- brise.changes | 9 +++++++++ brise.spec | 52 +++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/brise.changes b/brise.changes index b00d6d3..353a2c3 100644 --- a/brise.changes +++ b/brise.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Sep 4 18:18:06 UTC 2023 - Cliff Zhao + +- Update brise.spec: + * Add Conflicts condition to insure brise could update successfully + from brise binary rpm, for SUSE:SLE-SP6 update. + * Replace rime-schema-all dependence to real package name to + avoid 2 level of virtual packages when it installed. + ------------------------------------------------------------------- Sat Jun 3 07:29:19 UTC 2023 - Marguerite Su diff --git a/brise.spec b/brise.spec index 57df569..b81581c 100644 --- a/brise.spec +++ b/brise.spec @@ -19,8 +19,6 @@ Name: brise Version: 20230603+git.5fdd2d6 Release: 0 -# Is it needed at all to sync the build counter? -#!BcntSyncTag: librime Summary: Rime Input Schemas Collection License: GPL-3.0-or-later Group: System/I18n/Chinese @@ -56,6 +54,7 @@ Requires: rime-schema-luna-pinyin Requires: rime-schema-prelude Requires: rime-schema-stroke Requires: rime-schema-terra-pinyin +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-default @@ -79,6 +78,7 @@ Requires: rime-schema-soutzoe Requires: rime-schema-stenotype Requires: rime-schema-wubi Requires: rime-schema-wugniu +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-extra @@ -87,8 +87,29 @@ Extra collection of rime schemas. %package -n rime-schema-all Summary: All rime input schemas Group: System/I18n/Chinese -Requires: rime-schema-default -Requires: rime-schema-extra +Requires: rime-schema-bopomofo +Requires: rime-schema-cangjie +Requires: rime-schema-custom +Requires: rime-schema-essay +Requires: rime-schema-luna-pinyin +Requires: rime-schema-prelude +Requires: rime-schema-stroke +Requires: rime-schema-terra-pinyin +Requires: rime-schema-array +Requires: rime-schema-cantonese +Requires: rime-schema-combo-pinyin +Requires: rime-schema-double-pinyin +Requires: rime-schema-emoji +Requires: rime-schema-essay-simp +Requires: rime-schema-ipa +Requires: rime-schema-middle-chinese +Requires: rime-schema-pinyin-simp +Requires: rime-schema-quick +Requires: rime-schema-scj +Requires: rime-schema-soutzoe +Requires: rime-schema-stenotype +Requires: rime-schema-wubi +Requires: rime-schema-wugniu Provides: brise = %{version} Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch @@ -99,6 +120,7 @@ All rime input schemas. %package -n rime-schema-bopomofo Summary: bopomofo input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-bopomofo @@ -107,6 +129,7 @@ bopomofo input schema for rime. %package -n rime-schema-cangjie Summary: cangjie input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-cangjie @@ -115,6 +138,7 @@ cangjie input schema for rime. %package -n rime-schema-custom Summary: basic schema to customize rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-custom @@ -123,6 +147,7 @@ basic schema to customize rime. %package -n rime-schema-essay Summary: essay input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-essay @@ -131,6 +156,7 @@ essay input schema for rime. %package -n rime-schema-essay-simp Summary: simplified essay input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-essay-simp @@ -139,6 +165,7 @@ simplified essay input schema for rime. %package -n rime-schema-luna-pinyin Summary: luna-pinyin input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-luna-pinyin @@ -147,6 +174,7 @@ luna-pinyin input schema for rime. %package -n rime-schema-prelude Summary: prelude input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-prelude @@ -155,6 +183,7 @@ prelude input schema for rime. %package -n rime-schema-stroke Summary: stroke input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-stroke @@ -163,6 +192,7 @@ stroke input schema for rime. %package -n rime-schema-terra-pinyin Summary: terra-pinyin input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-terra-pinyin @@ -171,6 +201,7 @@ terra-pinyin input schema for rime. %package -n rime-schema-array Summary: array input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-array @@ -182,6 +213,7 @@ Group: System/I18n/Chinese BuildArch: noarch Provides: rime-schema-jyutping > 20230528+git.cece251 Obsoletes: rime-schema-jyutping <= 20230528+git.cece251 +Obsoletes: brise <= 0.39+git20190120.8d5bc2e %description -n rime-schema-cantonese cantonese(jyutping) input schema for rime. @@ -189,6 +221,7 @@ cantonese(jyutping) input schema for rime. %package -n rime-schema-combo-pinyin Summary: combo-pinyin input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-combo-pinyin @@ -197,6 +230,7 @@ combo-pinyin input schema for rime. %package -n rime-schema-double-pinyin Summary: double-pinyin input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-double-pinyin @@ -205,6 +239,7 @@ double-pinyin input schema for rime. %package -n rime-schema-emoji Summary: emoji input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-emoji @@ -213,6 +248,7 @@ emoji input schema for rime. %package -n rime-schema-ipa Summary: ipa input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-ipa @@ -221,6 +257,7 @@ ipa input schema for rime. %package -n rime-schema-middle-chinese Summary: middle-chinese input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-middle-chinese @@ -229,6 +266,7 @@ middle-chinese input schema for rime. %package -n rime-schema-pinyin-simp Summary: pinyin-simp input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-pinyin-simp @@ -237,6 +275,7 @@ pinyin-simp input schema for rime. %package -n rime-schema-quick Summary: quick input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-quick @@ -245,6 +284,7 @@ quick input schema for rime. %package -n rime-schema-scj Summary: scj input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-scj @@ -253,6 +293,7 @@ scj input schema for rime. %package -n rime-schema-soutzoe Summary: soutzoe input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-soutzoe @@ -261,6 +302,7 @@ soutzoe input schema for rime. %package -n rime-schema-stenotype Summary: stenotype input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-stenotype @@ -269,6 +311,7 @@ stenotype input schema for rime. %package -n rime-schema-wubi Summary: wubi input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-wubi @@ -277,6 +320,7 @@ wubi input schema for rime. %package -n rime-schema-wugniu Summary: wugniu input schema for rime Group: System/I18n/Chinese +Obsoletes: brise <= 0.39+git20190120.8d5bc2e BuildArch: noarch %description -n rime-schema-wugniu