From baf12a26ad9ee4315eaef612910d67fdd2cdcd0ff185e1807f88ae1cf0ff4e4f Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sat, 20 Jul 2019 13:19:40 +0000 Subject: [PATCH 1/2] Accepting request 717213 from home:MargueriteSu:branches:M17N - update 0.39+git20190120.8d5ec2e * brise was deprecated since plum came out. openSUSE still provides brise but it is just a collection of ":all" schema set fetched by plum. the version will just indicate the time when maintainer updates the package from now on, because every schema has a separate git repository and no way to get a version. but we'd better collect some major changes from these repositories and list here. OBS-URL: https://build.opensuse.org/request/show/717213 OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=11 --- README | 9 +++++++ _service | 17 -------------- _servicedata | 4 ---- brise-0.36+git20160221.7dbd56b.tar.xz | 3 --- brise-0.39+git20190120.8d5bc2e.tar.xz | 3 +++ brise.changes | 13 ++++++++++ brise.spec | 34 +++++++++++++++++++++------ rime-plum-go.tar.xz | 3 +++ 8 files changed, 55 insertions(+), 31 deletions(-) create mode 100644 README delete mode 100644 _service delete mode 100644 _servicedata delete mode 100644 brise-0.36+git20160221.7dbd56b.tar.xz create mode 100644 brise-0.39+git20190120.8d5bc2e.tar.xz create mode 100644 rime-plum-go.tar.xz diff --git a/README b/README new file mode 100644 index 0000000..fcc233d --- /dev/null +++ b/README @@ -0,0 +1,9 @@ +brise is deprecated since plum comes out. + +the standard [plum](https://github.com/rime/plum) is developed in bash. openSUSE uses [rime-plum-go](https://github.com/marguerite/rime-plum-go). + +brise in openSUSE is just a checkout of :all + + mkdir brise-0.38 + go build rime-plum-go/plum.go + rime-plum-go/plum -d brise -b -r :all diff --git a/_service b/_service deleted file mode 100644 index a9c4666..0000000 --- a/_service +++ /dev/null @@ -1,17 +0,0 @@ - - - https://github.com/rime/brise.git - git - .git - 0.36+git%cd.%h - master - enable - - - brise-*.tar - xz - - - brise - - diff --git a/_servicedata b/_servicedata deleted file mode 100644 index 98b4aea..0000000 --- a/_servicedata +++ /dev/null @@ -1,4 +0,0 @@ - - - https://github.com/rime/brise.git - 7dbd56b9ce08f75228a7c897109ec397cb48b057 \ No newline at end of file diff --git a/brise-0.36+git20160221.7dbd56b.tar.xz b/brise-0.36+git20160221.7dbd56b.tar.xz deleted file mode 100644 index 3b848f8..0000000 --- a/brise-0.36+git20160221.7dbd56b.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4326d2d2ff95a7ad518f8ea5935af15295ce70db2004ef929cc3e6e13d050adf -size 4946204 diff --git a/brise-0.39+git20190120.8d5bc2e.tar.xz b/brise-0.39+git20190120.8d5bc2e.tar.xz new file mode 100644 index 0000000..0fbdef8 --- /dev/null +++ b/brise-0.39+git20190120.8d5bc2e.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8d182e16003d2d55030ffcf7fa9f01f912ec05ae2f89980ac11a57fc029620f +size 21962300 diff --git a/brise.changes b/brise.changes index 1be8a19..ae79816 100644 --- a/brise.changes +++ b/brise.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat Jul 20 09:56:51 UTC 2019 - Marguerite Su + +- update 0.39+git20190120.8d5ec2e + * brise was deprecated since plum came out. openSUSE still + provides brise but it is just a collection of ":all" + schema set fetched by plum. the version will just + indicate the time when maintainer updates the package + from now on, because every schema has a separate git + repository and no way to get a version. but we'd better + collect some major changes from these repositories and + list here. + ------------------------------------------------------------------- Wed Mar 14 19:55:18 2016 - qzhao@suse.com diff --git a/brise.spec b/brise.spec index a1a47c9..0fa9b1f 100644 --- a/brise.spec +++ b/brise.spec @@ -17,15 +17,15 @@ Name: brise -Version: 0.36+git20160221.7dbd56b +Version: 0.39+git20190120.8d5bc2e Release: 0 Summary: Rime Input Schemas Collection License: GPL-3.0+ Group: System/I18n/Chinese -Url: https://github.com/lotem/brise +Url: https://github.com/rime/brise Source: brise-%{version}.tar.xz -BuildRequires: kyotocabinet -BuildRequires: librime-devel +Source1: rime-plum-go.tar.xz +BuildRequires: go BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -35,18 +35,38 @@ 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. + %prep %setup -q +echo %{_builddir} +mkdir -p %{_builddir}/go/src/github.com/marguerite +tar -xf %{S:1} -C %{_builddir}/go/src/github.com/marguerite +cp -r %{_builddir}/go/src/github.com/marguerite/rime-plum-go/vendor/* %{_builddir}/go/src/ %build -make %{?_smp_mflags} +pushd %{_builddir}/go/src/github.com/marguerite/rime-plum-go +export GOPATH=%{_builddir}/go +go build plum.go +popd %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +mkdir -p %{buildroot}%{_bindir} +install -m 0755 %{_builddir}/go/src/github.com/marguerite/rime-plum-go/plum %{buildroot}%{_bindir}/rime-plum +mkdir -p %{buildroot}%{_datadir}/rime-data +rm -rf package +cp -r * %{buildroot}%{_datadir}/rime-data %files %defattr(-,root,root) %{_datadir}/rime-data/ -%doc LICENSE + +%files -n rime-plum +%{_bindir}/rime-plum %changelog diff --git a/rime-plum-go.tar.xz b/rime-plum-go.tar.xz new file mode 100644 index 0000000..5bdf800 --- /dev/null +++ b/rime-plum-go.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35f3de715c74389f42fe8dc6f1576093989c486debb87c3d1befb73efcbd2ef0 +size 3368388 From 91f86a939885a2b52a076c915c7b5c1577759a711bb8719e345206332776378b Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sat, 20 Jul 2019 13:26:46 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=12 --- brise.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/brise.spec b/brise.spec index 0fa9b1f..fba3b00 100644 --- a/brise.spec +++ b/brise.spec @@ -25,6 +25,7 @@ Group: System/I18n/Chinese Url: https://github.com/rime/brise Source: brise-%{version}.tar.xz Source1: rime-plum-go.tar.xz +Source99: README BuildRequires: go BuildRoot: %{_tmppath}/%{name}-%{version}-build