Accepting request 1253294 from M17N

OBS-URL: https://build.opensuse.org/request/show/1253294 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/brise?expand=0&rev=23
- update 20250315
2025-03-17 21:16:32 +00:00 · 2025-03-15 06:20:19 +00:00 · 2025-02-09 19:01:54 +00:00 · 2025-02-08 08:55:39 +00:00 · 2025-02-06 21:04:16 +00:00 · 2025-02-06 12:18:20 +00:00
7 changed files with 83 additions and 87 deletions
--- a/5
+++ b/5
@@ -4,7 +4,8 @@ the standard [plum](https://github.com/rime/plum) is developed in bash. openSUSE

 brise in openSUSE is just a checkout of :all

-    mkdir brise
+    mkdir brise-20250315
    export GO111MODULE=on
    go build rime-plum-go
-    rime_dir=brise rime-plum-go/rime-plum-go :all
+    rime_dir=brise rime_frontend=fcitx rime-plum-go/rime-plum-go :all
+    tar -c brise-20250315 | zstd > brise-20250315.tar.zst
--- a/14
+++ b/14
@@ -1,14 +0,0 @@
-<services>
-  <service name="tar_scm" mode="disabled">
-    <param name="url">https://github.com/marguerite/rime-plum-go</param>
-    <param name="scm">git</param>
-    <param name="versionformat">%cs+git.%h</param>
-    <param name="revision">master</param>
-    <param name="filename">rime-plum-go</param>
-  </service>
-  <service name="recompress" mode="disabled">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-  <service name="set_version" mode="disabled"/>
-</services>
--- a/brise-20230603+git.5fdd2d6.tar.xz
+++ b/brise-20230603+git.5fdd2d6.tar.xz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa793f88b4a38cb1bab899c83031305a4459dc85b4373724a171913423e87572
-size 30222388
--- a/brise-20250315.tar.zst
+++ b/brise-20250315.tar.zst
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6059ef34e0ef6c8161b919fb1f74223f34227c4687ddfaa9c0ae2a905d4bf9df
+size 56304141
--- a/brise.changes
+++ b/brise.changes
@@ -1,7 +1,26 @@
+-------------------------------------------------------------------
+Sat Mar 15 05:38:13 UTC 2025 - Marguerite Su <i@marguerite.su>
+
+- update 20250315
+  * add emoji-cantonese schema 
+- capitalize Summary, and precisely describle the input schemas
+
+-------------------------------------------------------------------
+Thu Jan  2 18:18:06 UTC 2025 - Cliff Zhao <qzhao@suse.com>
+
+- Split rime-plum-go out of brise:
+  * go-git is rime-plum-go's component, it meet security issue of
+    the argument injection vulnerability, when rime-plum-go deliver
+    under brise's source code, it is hard to update seperately.
+  * rime-plum-go is a separate project and has a different upstream.
+  * I have done my best to keep the original code the same in
+    respect of Marguerite's hard work.
+  (CVE-2025-21613, bsc#1235573, CVE-2024-45337, bsc#1234597)
+
 -------------------------------------------------------------------
 Mon Sep  4 18:18:06 UTC 2023 - Cliff Zhao <qzhao@suse.com>

- Update brise.spec: 
+- 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
@@ -25,7 +44,7 @@ Mon May 29 13:47:27 UTC 2023 - Marguerite Su <i@marguerite.su>
 -------------------------------------------------------------------
 Tue May 25 04:24:13 UTC 2021 - Marguerite Su <i@marguerite.su>

- don't install .bin files in build 
+- don't install .bin files in build

 -------------------------------------------------------------------
 Tue May 25 03:12:08 UTC 2021 - Marguerite Su <i@marguerite.su>
@@ -40,7 +59,7 @@ Tue May 25 03:12:08 UTC 2021 - Marguerite Su <i@marguerite.su>
 -------------------------------------------------------------------
 Sun May  9 02:42:55 UTC 2021 - Fusion Future <qydwhotmail@gmail.com>

- revert "remove rime-plum in package brise and ready to move it into a new package for easier maintenance" 
+- revert "remove rime-plum in package brise and ready to move it into a new package for easier maintenance"

 -------------------------------------------------------------------
 Thu May  6 12:33:23 UTC 2021 - Fusion Future <qydwhotmail@gmail.com>
@@ -128,7 +147,7 @@ Sat Jun 29 09:46:24 UTC 2013 - i@marguerite.su
 - update version 0.22
  * essay.txt, luna_pinyin, terra_pinyin: lots of bug-fixes.
  * wubi86: auto-commit complete words. (max_code_length: 4)
-  * luna_pinyin*: enable user created custom_phrase.txt (rime>=0.9.9) 
+  * luna_pinyin*: enable user created custom_phrase.txt (rime>=0.9.9)

 -------------------------------------------------------------------
 Fri Feb  1 17:01:31 UTC 2013 - i@marguerite.su
@@ -163,4 +182,3 @@ Sat Jul 21 22:37:03 UTC 2012 - i@marguerite.su
  * librime package: include 'brise', a collection of preset schemata in the package.
  * new schema: Middle Chinese Phonetic Transcription.
  * new schema: IPA input method in X-SAMPA.
-
--- a/brise.spec
+++ b/brise.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package brise
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,15 @@


 Name:           brise
-Version:        20230603+git.5fdd2d6
+Version:        20250315
 Release:        0
 Summary:        Rime Input Schemas Collection
 License:        GPL-3.0-or-later
 Group:          System/I18n/Chinese
 URL:            https://github.com/rime/brise
-Source:         brise-%{version}.tar.xz
-Source1:        rime-plum-go-%{version}.tar.xz
+Source:         brise-%{version}.tar.zst
 Source99:       README
-BuildRequires:  golang(API) >= 1.17
-
+BuildRequires:  zstd

 %description
 Rime is an Traditional Chinese input method engine.
@@ -36,13 +34,6 @@ Mainly it's about to express your thinking with your keystrokes.

 Brise is the input schemas collection of Rime.

-%package -n rime-plum
-Summary:        Rime's configuration manager
-Group:          System/I18n/Chinese
-
-%description -n rime-plum
-Plum is rime's configuration manager.
-
 %package -n rime-schema-default
 Summary:        Default/Preset collection of rime schemas
 Group:          System/I18n/Chinese
@@ -78,6 +69,7 @@ Requires:       rime-schema-soutzoe
 Requires:       rime-schema-stenotype
 Requires:       rime-schema-wubi
 Requires:       rime-schema-wugniu
+Requires:       rime-schema-emoji-cantonese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch

@@ -87,29 +79,30 @@ Extra collection of rime schemas.
 %package -n rime-schema-all
 Summary:        All rime input schemas
 Group:          System/I18n/Chinese
+Requires:       rime-schema-array
 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-custom
 Requires:       rime-schema-double-pinyin
 Requires:       rime-schema-emoji
+Requires:       rime-schema-essay
 Requires:       rime-schema-essay-simp
 Requires:       rime-schema-ipa
+Requires:       rime-schema-luna-pinyin
 Requires:       rime-schema-middle-chinese
 Requires:       rime-schema-pinyin-simp
+Requires:       rime-schema-prelude
 Requires:       rime-schema-quick
 Requires:       rime-schema-scj
 Requires:       rime-schema-soutzoe
 Requires:       rime-schema-stenotype
+Requires:       rime-schema-stroke
+Requires:       rime-schema-terra-pinyin
 Requires:       rime-schema-wubi
 Requires:       rime-schema-wugniu
+Requires:       rime-schema-emoji-cantonese
 Provides:       brise = %{version}
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -118,7 +111,7 @@ BuildArch:      noarch
 All rime input schemas.

 %package -n rime-schema-bopomofo
-Summary:        bopomofo input schema for rime
+Summary:        Bopomofo input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -127,7 +120,7 @@ BuildArch:      noarch
 bopomofo input schema for rime.

 %package -n rime-schema-cangjie
-Summary:        cangjie input schema for rime
+Summary:        Cangjie input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -136,7 +129,7 @@ BuildArch:      noarch
 cangjie input schema for rime.

 %package -n rime-schema-custom
-Summary:        basic schema to customize rime
+Summary:        Basic schema to customize rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -145,7 +138,7 @@ BuildArch:      noarch
 basic schema to customize rime.

 %package -n rime-schema-essay
-Summary:        essay input schema for rime
+Summary:        Essay input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -154,7 +147,7 @@ BuildArch:      noarch
 essay input schema for rime.

 %package -n rime-schema-essay-simp
-Summary:        simplified essay input schema for rime
+Summary:        Simplified essay input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -163,7 +156,7 @@ BuildArch:      noarch
 simplified essay input schema for rime.

 %package -n rime-schema-luna-pinyin
-Summary:        luna-pinyin input schema for rime
+Summary:        Luna-pinyin input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -172,7 +165,7 @@ BuildArch:      noarch
 luna-pinyin input schema for rime.

 %package -n rime-schema-prelude
-Summary:        prelude input schema for rime
+Summary:        Prelude input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -181,7 +174,7 @@ BuildArch:      noarch
 prelude input schema for rime.

 %package -n rime-schema-stroke
-Summary:        stroke input schema for rime
+Summary:        Stroke input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -190,7 +183,7 @@ BuildArch:      noarch
 stroke input schema for rime.

 %package -n rime-schema-terra-pinyin
-Summary:        terra-pinyin input schema for rime
+Summary:        Terra-pinyin input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -199,7 +192,7 @@ BuildArch:      noarch
 terra-pinyin input schema for rime.

 %package -n rime-schema-array
-Summary:        array input schema for rime
+Summary:        Array input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -208,18 +201,18 @@ BuildArch:      noarch
 array input schema for rime.

 %package -n rime-schema-cantonese
-Summary:        cantonese input schema for rime
+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
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
+BuildArch:      noarch

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

 %package -n rime-schema-combo-pinyin
-Summary:        combo-pinyin input schema for rime
+Summary:        Combo-pinyin input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -228,7 +221,7 @@ BuildArch:      noarch
 combo-pinyin input schema for rime.

 %package -n rime-schema-double-pinyin
-Summary:        double-pinyin input schema for rime
+Summary:        Double-pinyin input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -237,7 +230,7 @@ BuildArch:      noarch
 double-pinyin input schema for rime.

 %package -n rime-schema-emoji
-Summary:        emoji input schema for rime
+Summary:        Emoji input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -245,8 +238,17 @@ BuildArch:      noarch
 %description -n rime-schema-emoji
 emoji input schema for rime.

+%package -n rime-schema-emoji-cantonese
+Summary:        Rime scheme to input emoji with cantonese wording
+Group:          System/I18n/Chinese
+Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
+BuildArch:      noarch
+
+%description -n rime-schema-emoji-cantonese
+rime scheme to input emoji with cantonese wording.
+
 %package -n rime-schema-ipa
-Summary:        ipa input schema for rime
+Summary:        Rime schema to input IPA
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -255,16 +257,16 @@ BuildArch:      noarch
 ipa input schema for rime.

 %package -n rime-schema-middle-chinese
-Summary:        middle-chinese input schema for rime
+Summary:        Medieval chinese input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch

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

 %package -n rime-schema-pinyin-simp
-Summary:        pinyin-simp input schema for rime
+Summary:        Pinyin-simp input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -273,25 +275,25 @@ BuildArch:      noarch
 pinyin-simp input schema for rime.

 %package -n rime-schema-quick
-Summary:        quick input schema for rime
+Summary:        Quick(er than canjie) input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch

 %description -n rime-schema-quick
-quick input schema for rime.
+quick input schema for rime, based on cangjie, but input quicker.

 %package -n rime-schema-scj
-Summary:        scj input schema for rime
+Summary:        Smart cangjie(scj) input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch

 %description -n rime-schema-scj
-scj input schema for rime.
+Smart cangjie(scj) input schema for rime.

 %package -n rime-schema-soutzoe
-Summary:        soutzoe input schema for rime
+Summary:        Soutzoe input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -300,7 +302,7 @@ BuildArch:      noarch
 soutzoe input schema for rime.

 %package -n rime-schema-stenotype
-Summary:        stenotype input schema for rime
+Summary:        Stenotype input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -309,7 +311,7 @@ BuildArch:      noarch
 stenotype input schema for rime.

 %package -n rime-schema-wubi
-Summary:        wubi input schema for rime
+Summary:        Wubi input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -318,7 +320,7 @@ BuildArch:      noarch
 wubi input schema for rime.

 %package -n rime-schema-wugniu
-Summary:        wugniu input schema for rime
+Summary:        Wugniu input schema for rime
 Group:          System/I18n/Chinese
 Obsoletes:      brise <= 0.39+git20190120.8d5bc2e
 BuildArch:      noarch
@@ -329,28 +331,16 @@ wugniu input schema for rime.
 %prep
 %setup -q
 echo %{_builddir}
-mkdir -p %{_builddir}/go/src/github.com/marguerite
-tar -xf %{SOURCE1} -C %{_builddir}/go/src/github.com/marguerite
-cp -r %{_builddir}/go/src/github.com/marguerite/rime-plum-go-%{version}/vendor/* %{_builddir}/go/src/

 %build
-pushd %{_builddir}/go/src/github.com/marguerite/rime-plum-go-%{version}
-export GOPATH=%{_builddir}/go
-go build
-popd

 %install
-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
 cp -r * %{buildroot}%{_datadir}/rime-data

-%files -n rime-plum
-%{_bindir}/rime-plum
-
 %files -n rime-schema-default
 %dir %{_datadir}/rime-data

@@ -427,7 +417,11 @@ cp -r * %{buildroot}%{_datadir}/rime-data

 %files -n rime-schema-emoji
 %dir %{_datadir}/rime-data
-%{_datadir}/rime-data/emoji*.yaml
+%{_datadir}/rime-data/emoji_suggestion.yaml
+
+%files -n rime-schema-emoji-cantonese
+%dir %{_datadir}/rime-data
+%{_datadir}/rime-data/emoji_cantonese_suggestion.yaml

 %files -n rime-schema-ipa
 %dir %{_datadir}/rime-data
--- a/rime-plum-go-20230603+git.5fdd2d6.tar.xz
+++ b/rime-plum-go-20230603+git.5fdd2d6.tar.xz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10529dc884c089f8f278129761752b791c5f15c18c6692639b8ec16ed144b542
-size 2522912
Author	SHA256	Message	Date
Ana Guerrero	3e51f2062d	Accepting request 1253294 from M17N OBS-URL: https://build.opensuse.org/request/show/1253294 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/brise?expand=0&rev=23	2025-03-17 21:16:32 +00:00
Marguerite Su	3efac8f481	- update 20250315 * add emoji-cantonese schema - capitalize Summary, and precisely describle the input schemas OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=26	2025-03-15 06:20:19 +00:00
Dominique Leuenberger	54aaf0624b	Accepting request 1244319 from M17N OBS-URL: https://build.opensuse.org/request/show/1244319 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/brise?expand=0&rev=22	2025-02-09 19:01:54 +00:00
Takashi Iwai	b888df681e	Fix previous CVE bug number typo. OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=25	2025-02-08 08:55:39 +00:00
Ana Guerrero	47b4bb70ec	Accepting request 1243623 from M17N OBS-URL: https://build.opensuse.org/request/show/1243623 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/brise?expand=0&rev=21	2025-02-06 21:04:16 +00:00
Hillwood Yang	d62a9a30c2	Add another bug number which fixed by previous commit (CVE-2024-45337, bsc#1234597) OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=24	2025-02-06 12:18:20 +00:00
Ana Guerrero	bf4eef709f	Accepting request 1242807 from M17N OBS-URL: https://build.opensuse.org/request/show/1242807 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/brise?expand=0&rev=20	2025-02-03 20:45:04 +00:00
Takashi Iwai	08d31efba1	Split rime-plum-go out of brise: * go-git is rime-plum-go's component, it meet security issue of the argument injection vulnerability, when rime-plum-go deliver under brise's source code, it is hard to update seperately. * rime-plum-go is a separate project and has a different upstream. * I have done my best to keep the original code the same in respect of Marguerite's hard work. (CVE-2025-2161, bsc#1235573) OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=23	2025-02-03 12:09:10 +00:00