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

brise.changes

@@ -1,7 +1,19 @@
+-------------------------------------------------------------------
+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 +37,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 +52,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 +140,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 +175,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.
-

brise.spec

@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-
 Name:           brise
 Version:        20230603+git.5fdd2d6
 Release:        0
@@ -24,11 +23,9 @@ 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
 Source99:       README
 BuildRequires:  golang(API) >= 1.17
 
-
 %description
 Rime is an Traditional Chinese input method engine.
 Its idea comes from ancient Chinese brush and carving art.
@@ -36,13 +33,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
@@ -329,28 +319,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
 

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