Accepting request 1090627 from home:MargueriteSu:branches:M17N

- update brise 20230603+git.5fdd2d6 * replace io/ioutil usage * deprecate rime-jyutping with rime-cantonese * add rime-custom OBS-URL: https://build.opensuse.org/request/show/1090627 OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=20
2023-06-03 09:55:00 +00:00
parent 35203a3197
commit c1f475a2a9
7 changed files with 70 additions and 47 deletions
--- a/brise-20220528.tar.xz
+++ b/brise-20220528.tar.xz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b8917d8a6430a95c4b21385eaaa942226c86ae3c1694840626761f676a6cf72
-size 33282316
--- a/brise-20230528+git.cece251.tar.xz
+++ b/brise-20230528+git.cece251.tar.xz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f0350a00640b3c911a49447fb9050620d78157d4c0c3ea083e5bc7605b08958c
-size 33285792
--- a/brise-20230603+git.5fdd2d6.tar.xz
+++ b/brise-20230603+git.5fdd2d6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa793f88b4a38cb1bab899c83031305a4459dc85b4373724a171913423e87572
+size 30222388
--- a/brise.changes
+++ b/brise.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Jun  3 07:29:19 UTC 2023 - Marguerite Su <i@marguerite.su>
+
+- update brise 20230603+git.5fdd2d6
+  * replace io/ioutil usage
+  * deprecate rime-jyutping with rime-cantonese
+  * add rime-custom
+
 -------------------------------------------------------------------
 Mon May 29 13:47:27 UTC 2023 - Marguerite Su <i@marguerite.su>

--- a/brise.spec
+++ b/brise.spec
@@ -17,7 +17,7 @@


 Name:           brise
-Version:        20230528+git.cece251
+Version:        20230603+git.5fdd2d6
 Release:        0
 Summary:        Rime Input Schemas Collection
 License:        GPL-3.0-or-later
@@ -47,6 +47,7 @@ Summary:        Default/Preset collection of rime schemas
 Group:          System/I18n/Chinese
 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
@@ -65,8 +66,8 @@ 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-jyutping
 Requires:       rime-schema-middle-chinese
 Requires:       rime-schema-pinyin-simp
 Requires:       rime-schema-quick
@@ -98,7 +99,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-bopomofo
-bopomofoinput schema for rime.
+bopomofo input schema for rime.

 %package -n rime-schema-cangjie
 Summary:        cangjie input schema for rime
@@ -106,7 +107,15 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-cangjie
-cangjieinput schema for rime.
+cangjie input schema for rime.
+
+%package -n rime-schema-custom
+Summary:        basic schema to customize rime
+Group:          System/I18n/Chinese
+BuildArch:      noarch
+
+%description -n rime-schema-custom
+basic schema to customize rime.

 %package -n rime-schema-essay
 Summary:        essay input schema for rime
@@ -114,7 +123,15 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-essay
-essayinput schema for rime.
+essay input schema for rime.
+
+%package -n rime-schema-essay-simp
+Summary:        simplified essay input schema for rime
+Group:          System/I18n/Chinese
+BuildArch:      noarch
+
+%description -n rime-schema-essay-simp
+simplified essay input schema for rime.

 %package -n rime-schema-luna-pinyin
 Summary:        luna-pinyin input schema for rime
@@ -122,7 +139,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-luna-pinyin
-luna-pinyininput schema for rime.
+luna-pinyin input schema for rime.

 %package -n rime-schema-prelude
 Summary:        prelude input schema for rime
@@ -130,7 +147,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-prelude
-preludeinput schema for rime.
+prelude input schema for rime.

 %package -n rime-schema-stroke
 Summary:        stroke input schema for rime
@@ -138,7 +155,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-stroke
-strokeinput schema for rime.
+stroke input schema for rime.

 %package -n rime-schema-terra-pinyin
 Summary:        terra-pinyin input schema for rime
@@ -146,7 +163,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-terra-pinyin
-terra-pinyininput schema for rime.
+terra-pinyin input schema for rime.

 %package -n rime-schema-array
 Summary:        array input schema for rime
@@ -154,15 +171,17 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-array
-arrayinput schema for rime.
+array input schema for rime.

 %package -n rime-schema-cantonese
 Summary:        cantonese input schema for rime
 Group:          System/I18n/Chinese
 BuildArch:      noarch
+Provides:       rime-schema-jyutping > 20230528+git.cece251
+Obsoletes:      rime-schema-jyutping <= 20230528+git.cece251

 %description -n rime-schema-cantonese
-cantoneseinput schema for rime.
+cantonese(jyutping) input schema for rime.

 %package -n rime-schema-combo-pinyin
 Summary:        combo-pinyin input schema for rime
@@ -170,7 +189,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-combo-pinyin
-combo-pinyininput schema for rime.
+combo-pinyin input schema for rime.

 %package -n rime-schema-double-pinyin
 Summary:        double-pinyin input schema for rime
@@ -178,7 +197,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-double-pinyin
-double-pinyininput schema for rime.
+double-pinyin input schema for rime.

 %package -n rime-schema-emoji
 Summary:        emoji input schema for rime
@@ -186,7 +205,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-emoji
-emojiinput schema for rime.
+emoji input schema for rime.

 %package -n rime-schema-ipa
 Summary:        ipa input schema for rime
@@ -194,15 +213,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-ipa
-ipainput schema for rime.
-
-%package -n rime-schema-jyutping
-Summary:        jyutping input schema for rime
-Group:          System/I18n/Chinese
-BuildArch:      noarch
-
-%description -n rime-schema-jyutping
-jyutpinginput schema for rime.
+ipa input schema for rime.

 %package -n rime-schema-middle-chinese
 Summary:        middle-chinese input schema for rime
@@ -210,7 +221,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-middle-chinese
-middle-chineseinput schema for rime.
+middle-chinese input schema for rime.

 %package -n rime-schema-pinyin-simp
 Summary:        pinyin-simp input schema for rime
@@ -218,7 +229,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-pinyin-simp
-pinyin-simpinput schema for rime.
+pinyin-simp input schema for rime.

 %package -n rime-schema-quick
 Summary:        quick input schema for rime
@@ -226,7 +237,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-quick
-quickinput schema for rime.
+quick input schema for rime.

 %package -n rime-schema-scj
 Summary:        scj input schema for rime
@@ -234,7 +245,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-scj
-scjinput schema for rime.
+scj input schema for rime.

 %package -n rime-schema-soutzoe
 Summary:        soutzoe input schema for rime
@@ -242,7 +253,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-soutzoe
-soutzoeinput schema for rime.
+soutzoe input schema for rime.

 %package -n rime-schema-stenotype
 Summary:        stenotype input schema for rime
@@ -250,7 +261,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-stenotype
-stenotypeinput schema for rime.
+stenotype input schema for rime.

 %package -n rime-schema-wubi
 Summary:        wubi input schema for rime
@@ -258,7 +269,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-wubi
-wubiinput schema for rime.
+wubi input schema for rime.

 %package -n rime-schema-wugniu
 Summary:        wugniu input schema for rime
@@ -266,7 +277,7 @@ Group:          System/I18n/Chinese
 BuildArch:      noarch

 %description -n rime-schema-wugniu
-wugniuinput schema for rime.
+wugniu input schema for rime.

 %prep
 %setup -q
@@ -285,9 +296,9 @@ popd
 mkdir -p %{buildroot}%{_bindir}
 install -m 0755 %{_builddir}/go/src/github.com/marguerite/rime-plum-go-%{version}/rime-plum-go %{buildroot}%{_bindir}/rime-plum
 mkdir -p %{buildroot}%{_datadir}/rime-data
+cp -r package/rime/custom/*.recipe.yaml %{buildroot}%{_datadir}/rime-data
 rm -rf package
 rm -rf config.txt
-#touch %{buildroot}%{_datadir}/rime-data/presets
 cp -r * %{buildroot}%{_datadir}/rime-data

 %files -n rime-plum
@@ -311,11 +322,24 @@ cp -r * %{buildroot}%{_datadir}/rime-data
 %dir %{_datadir}/rime-data
 %{_datadir}/rime-data/cangjie*.yaml

+%files -n rime-schema-custom
+%dir %{_datadir}/rime-data
+%{_datadir}/rime-data/add.recipe.yaml
+%{_datadir}/rime-data/clear_schema_list.recipe.yaml
+%{_datadir}/rime-data/set.recipe.yaml
+%{_datadir}/rime-data/use_key_bindings.recipe.yaml
+%{_datadir}/rime-data/use_switch_key.recipe.yaml
+%{_datadir}/rime-data/use_symbols.recipe.yaml
+
 %files -n rime-schema-essay
 %dir %{_datadir}/rime-data
 %{_datadir}/rime-data/essay.txt
 %{_datadir}/rime-data/essay-cantonese.txt

+%files -n rime-schema-essay-simp
+%dir %{_datadir}/rime-data
+%{_datadir}/rime-data/essay-zh-hans.txt
+
 %files -n rime-schema-luna-pinyin
 %dir %{_datadir}/rime-data
 %{_datadir}/rime-data/luna_pinyin*.yaml
@@ -362,12 +386,6 @@ cp -r * %{buildroot}%{_datadir}/rime-data
 %dir %{_datadir}/rime-data
 %{_datadir}/rime-data/ipa*.yaml

-%files -n rime-schema-jyutping
-%dir %{_datadir}/rime-data
-%{_datadir}/rime-data/jyutping*.yaml
-%{_datadir}/rime-data/yale*.yaml
-%{_datadir}/rime-data/hkcantonese*.yaml
-
 %files -n rime-schema-middle-chinese
 %dir %{_datadir}/rime-data
 %{_datadir}/rime-data/sampheng*.yaml
--- a/rime-plum-go-20230528+git.cece251.tar.xz
+++ b/rime-plum-go-20230528+git.cece251.tar.xz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0579d4bdef666257bd6e96e2d446d45d0759f98c327f070c391e61f594d6607
-size 2527940
--- a/rime-plum-go-20230603+git.5fdd2d6.tar.xz
+++ b/rime-plum-go-20230603+git.5fdd2d6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10529dc884c089f8f278129761752b791c5f15c18c6692639b8ec16ed144b542
+size 2522912