From 99e59721eb1f878fc612a8e647a8c62777a994589eab6edaa2e10c61c10bdd4f Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Sat, 8 May 2021 13:32:43 +0000 Subject: [PATCH 1/3] Accepting request 891031 from home:fusionfuture:branches:M17N [2/2] Remove rime-plum in package brise and ready to move it into a new package for easier maintenance OBS-URL: https://build.opensuse.org/request/show/891031 OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=16 --- brise.changes | 5 +++++ brise.spec | 22 ---------------------- rime-plum-go-20201009+git.3e1838a.tar.xz | 3 --- 3 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 rime-plum-go-20201009+git.3e1838a.tar.xz diff --git a/brise.changes b/brise.changes index 395cea2..7191a48 100644 --- a/brise.changes +++ b/brise.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 6 12:33:23 UTC 2021 - Fusion Future + +- remove rime-plum in package brise and ready to move it into a new package for easier maintenance + ------------------------------------------------------------------- Sat Oct 10 09:50:38 UTC 2020 - Marguerite Su diff --git a/brise.spec b/brise.spec index 503467b..83f292b 100644 --- a/brise.spec +++ b/brise.spec @@ -24,9 +24,7 @@ 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: go %description Rime is an Traditional Chinese input method engine. @@ -35,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 @@ -270,29 +261,16 @@ wugniuinput 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 plum.go -popd %install -mkdir -p %{buildroot}%{_bindir} -install -m 0755 %{_builddir}/go/src/github.com/marguerite/rime-plum-go-%{version}/plum %{buildroot}%{_bindir}/rime-plum mkdir -p %{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 -%{_bindir}/rime-plum - %files -n rime-schema-default %dir %{_datadir}/rime-data %dir %{_datadir}/rime-data/build diff --git a/rime-plum-go-20201009+git.3e1838a.tar.xz b/rime-plum-go-20201009+git.3e1838a.tar.xz deleted file mode 100644 index d74108b..0000000 --- a/rime-plum-go-20201009+git.3e1838a.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a2eb95728ae6ac85bbbef12be21f5038abc4562d106221739fb28b0a599216b -size 827008 From 8e36b56a88fa8440465ac4322ed420934ac259c4894596f2a90c7c5ef0772718 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 17 May 2021 12:01:12 +0000 Subject: [PATCH 2/3] Accepting request 891618 from home:fusionfuture:branches:M17N revert "remove rime-plum in package brise and ready to move it into a new package for easier maintenance" OBS-URL: https://build.opensuse.org/request/show/891618 OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=17 --- brise.changes | 5 +++++ brise.spec | 22 ++++++++++++++++++++++ rime-plum-go-20201009+git.3e1838a.tar.xz | 3 +++ 3 files changed, 30 insertions(+) create mode 100644 rime-plum-go-20201009+git.3e1838a.tar.xz diff --git a/brise.changes b/brise.changes index 7191a48..fdc0b5c 100644 --- a/brise.changes +++ b/brise.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 9 02:42:55 UTC 2021 - Fusion Future + +- 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 diff --git a/brise.spec b/brise.spec index 83f292b..503467b 100644 --- a/brise.spec +++ b/brise.spec @@ -24,7 +24,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: go %description Rime is an Traditional Chinese input method engine. @@ -33,6 +35,13 @@ 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 @@ -261,16 +270,29 @@ wugniuinput 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 plum.go +popd %install +mkdir -p %{buildroot}%{_bindir} +install -m 0755 %{_builddir}/go/src/github.com/marguerite/rime-plum-go-%{version}/plum %{buildroot}%{_bindir}/rime-plum mkdir -p %{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 +%{_bindir}/rime-plum + %files -n rime-schema-default %dir %{_datadir}/rime-data %dir %{_datadir}/rime-data/build diff --git a/rime-plum-go-20201009+git.3e1838a.tar.xz b/rime-plum-go-20201009+git.3e1838a.tar.xz new file mode 100644 index 0000000..d74108b --- /dev/null +++ b/rime-plum-go-20201009+git.3e1838a.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a2eb95728ae6ac85bbbef12be21f5038abc4562d106221739fb28b0a599216b +size 827008 From 411461d5bdabdfd532a21d9f005bbff6bae32c30feb083f3e085b7440ea0b543 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Tue, 25 May 2021 04:30:11 +0000 Subject: [PATCH 3/3] Accepting request 895226 from home:MargueriteSu:branches:M17N - don't install .bin files in build - update brise 20210525+git4f7fc2a * revamped rime-plum-go with CLI ui support via "--select" rime-plum-go is totally compatible with upstream plum and the go version respects "rime_dir" "rime_frontend" environment variables and "http_proxy"/"https_proxy" proxies. * brise data is updated to 20210525 OBS-URL: https://build.opensuse.org/request/show/895226 OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=18 --- README | 4 +-- brise-20201009+git.3e1838a.tar.xz | 3 --- brise-20210525+git.4f7fc2a.tar.xz | 3 +++ brise.changes | 15 +++++++++++ brise.spec | 33 +++++------------------- rime-plum-go-20201009+git.3e1838a.tar.xz | 3 --- rime-plum-go-20210525+git.4f7fc2a.tar.xz | 3 +++ 7 files changed, 29 insertions(+), 35 deletions(-) delete mode 100644 brise-20201009+git.3e1838a.tar.xz create mode 100644 brise-20210525+git.4f7fc2a.tar.xz delete mode 100644 rime-plum-go-20201009+git.3e1838a.tar.xz create mode 100644 rime-plum-go-20210525+git.4f7fc2a.tar.xz diff --git a/README b/README index 3938a15..0774afd 100644 --- a/README +++ b/README @@ -6,5 +6,5 @@ brise in openSUSE is just a checkout of :all mkdir brise export GO111MODULE=on - go build rime-plum-go/plum.go - rime-plum-go/plum -d brise -b -r :all + go build rime-plum-go + rime_dir=brise rime-plum-go/rime-plum-go :all diff --git a/brise-20201009+git.3e1838a.tar.xz b/brise-20201009+git.3e1838a.tar.xz deleted file mode 100644 index 5b4bbb1..0000000 --- a/brise-20201009+git.3e1838a.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7857310de52736667e3b5adfe2825032860e9bc377dd43161797142d4e65cfdd -size 22226624 diff --git a/brise-20210525+git.4f7fc2a.tar.xz b/brise-20210525+git.4f7fc2a.tar.xz new file mode 100644 index 0000000..1f6bf34 --- /dev/null +++ b/brise-20210525+git.4f7fc2a.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c15ee917c74420d642e03bf053e62524c99ba0b884c480f313f0dd955c70b71 +size 31030584 diff --git a/brise.changes b/brise.changes index fdc0b5c..6bec25b 100644 --- a/brise.changes +++ b/brise.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue May 25 04:24:13 UTC 2021 - Marguerite Su + +- don't install .bin files in build + +------------------------------------------------------------------- +Tue May 25 03:12:08 UTC 2021 - Marguerite Su + +- update brise 20210525+git4f7fc2a + * revamped rime-plum-go with CLI ui support via "--select" + rime-plum-go is totally compatible with upstream plum and + the go version respects "rime_dir" "rime_frontend" environment + variables and "http_proxy"/"https_proxy" proxies. + * brise data is updated to 20210525 + ------------------------------------------------------------------- Sun May 9 02:42:55 UTC 2021 - Fusion Future diff --git a/brise.spec b/brise.spec index 503467b..21e273a 100644 --- a/brise.spec +++ b/brise.spec @@ -17,7 +17,7 @@ Name: brise -Version: 20201009+git.3e1838a +Version: 20210525+git.4f7fc2a Release: 0 Summary: Rime Input Schemas Collection License: GPL-3.0-or-later @@ -26,7 +26,7 @@ URL: https://github.com/rime/brise Source: brise-%{version}.tar.xz Source1: rime-plum-go-%{version}.tar.xz Source99: README -BuildRequires: go +BuildRequires: golang(API) >= 1.13 %description Rime is an Traditional Chinese input method engine. @@ -278,12 +278,12 @@ cp -r %{_builddir}/go/src/github.com/marguerite/rime-plum-go-%{version}/vendor/* %build pushd %{_builddir}/go/src/github.com/marguerite/rime-plum-go-%{version} export GOPATH=%{_builddir}/go -go build plum.go +go build popd %install mkdir -p %{buildroot}%{_bindir} -install -m 0755 %{_builddir}/go/src/github.com/marguerite/rime-plum-go-%{version}/plum %{buildroot}%{_bindir}/rime-plum +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 rm -rf package rm -rf config.txt @@ -295,67 +295,46 @@ cp -r * %{buildroot}%{_datadir}/rime-data %files -n rime-schema-default %dir %{_datadir}/rime-data -%dir %{_datadir}/rime-data/build %files -n rime-schema-extra %dir %{_datadir}/rime-data -%dir %{_datadir}/rime-data/build %files -n rime-schema-all %dir %{_datadir}/rime-data -%dir %{_datadir}/rime-data/build %files -n rime-schema-bopomofo %dir %{_datadir}/rime-data -%dir %{_datadir}/rime-data/build %{_datadir}/rime-data/bopomofo*.yaml -%{_datadir}/rime-data/build/bopomofo*.bin -%{_datadir}/rime-data/build/bopomofo*.yaml +%{_datadir}/rime-data/zhuyin.yaml %files -n rime-schema-cangjie %dir %{_datadir}/rime-data -%dir %{_datadir}/rime-data/build %{_datadir}/rime-data/cangjie*.yaml -%{_datadir}/rime-data/build/cangjie*.bin -%{_datadir}/rime-data/build/cangjie*.yaml %files -n rime-schema-essay %dir %{_datadir}/rime-data -%dir %{_datadir}/rime-data/build %{_datadir}/rime-data/essay.txt %files -n rime-schema-luna-pinyin %dir %{_datadir}/rime-data -%dir %{_datadir}/rime-data/build %{_datadir}/rime-data/luna_pinyin*.yaml +%{_datadir}/rime-data/pinyin.yaml %{_datadir}/rime-data/luna_quanpin*.yaml -%{_datadir}/rime-data/build/luna_pinyin*.bin -%{_datadir}/rime-data/build/luna_pinyin*.yaml -%{_datadir}/rime-data/build/luna_quanpin*.bin -%{_datadir}/rime-data/build/luna_quanpin*.yaml %files -n rime-schema-prelude %dir %{_datadir}/rime-data -%dir %{_datadir}/rime-data/build %{_datadir}/rime-data/default.yaml %{_datadir}/rime-data/key_bindings.yaml %{_datadir}/rime-data/punctuation.yaml %{_datadir}/rime-data/symbols.yaml -%{_datadir}/rime-data/build/default.yaml %files -n rime-schema-stroke %dir %{_datadir}/rime-data -%dir %{_datadir}/rime-data/build %{_datadir}/rime-data/stroke*.yaml -%{_datadir}/rime-data/build/stroke*.bin -%{_datadir}/rime-data/build/stroke*.yaml %files -n rime-schema-terra-pinyin %dir %{_datadir}/rime-data -%dir %{_datadir}/rime-data/build %{_datadir}/rime-data/terra_pinyin*.yaml -%{_datadir}/rime-data/build/terra_pinyin*.bin -%{_datadir}/rime-data/build/terra_pinyin*.yaml %files -n rime-schema-array %dir %{_datadir}/rime-data diff --git a/rime-plum-go-20201009+git.3e1838a.tar.xz b/rime-plum-go-20201009+git.3e1838a.tar.xz deleted file mode 100644 index d74108b..0000000 --- a/rime-plum-go-20201009+git.3e1838a.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a2eb95728ae6ac85bbbef12be21f5038abc4562d106221739fb28b0a599216b -size 827008 diff --git a/rime-plum-go-20210525+git.4f7fc2a.tar.xz b/rime-plum-go-20210525+git.4f7fc2a.tar.xz new file mode 100644 index 0000000..d46fce6 --- /dev/null +++ b/rime-plum-go-20210525+git.4f7fc2a.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0a752911a519555aaaa62def3c851e96c8f53cd08bca476dddc9c3d5dc592f1 +size 2323632