From 0d0f4b95f3cbac6871981e95a145424d9a4b157b4df9bcd7c2aba14b5fc3d0b0 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Tue, 11 Aug 2015 02:30:57 +0000 Subject: [PATCH 1/4] Accepting request 321773 from home:MargueriteSu:branches:M17N OBS-URL: https://build.opensuse.org/request/show/321773 OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=5 --- brise.changes | 5 +++++ brise.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/brise.changes b/brise.changes index a2f53c7..96ee86e 100644 --- a/brise.changes +++ b/brise.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 11 02:30:14 UTC 2015 - i@marguerite.su + +- non-parallel build + ------------------------------------------------------------------- Sun Aug 10 09:14:36 UTC 2014 - i@marguerite.su diff --git a/brise.spec b/brise.spec index a5ce535..984c5fb 100644 --- a/brise.spec +++ b/brise.spec @@ -39,7 +39,7 @@ Brise is the input schemas collection of Rime. %setup -q %build -make %{?_smp_mflags} +make -j1 %install make DESTDIR=%{buildroot} install %{?_smp_mflags} From becc6a6d7c027cd77e25a70367b6e619c046c00ebffd0a0a94864aad1c2b6bb1 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Tue, 11 Aug 2015 15:28:26 +0000 Subject: [PATCH 2/4] Accepting request 321959 from home:MargueriteSu:branches:M17N OBS-URL: https://build.opensuse.org/request/show/321959 OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=6 --- Makefile-gdb.patch | 13 +++++++++++++ brise.changes | 5 ----- brise.spec | 16 ++++++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 Makefile-gdb.patch diff --git a/Makefile-gdb.patch b/Makefile-gdb.patch new file mode 100644 index 0000000..bb5b977 --- /dev/null +++ b/Makefile-gdb.patch @@ -0,0 +1,13 @@ +Index: brise-0.35+git20140810/Makefile +=================================================================== +--- brise-0.35+git20140810.orig/Makefile ++++ brise-0.35+git20140810/Makefile +@@ -18,7 +18,7 @@ all: + @cp symbols.yaml ${DATA} + @cp preset/*.yaml ${DATA} + @cp supplement/*.yaml ${DATA} +- rime_deployer --build ${DATA} ++ gdb --eval-command='set height 0' --eval-command='run' --eval-command='bt' --eval-command='quit' --args rime_deployer --build ${DATA} + + # deprecated + essay.kct: diff --git a/brise.changes b/brise.changes index 96ee86e..a2f53c7 100644 --- a/brise.changes +++ b/brise.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 11 02:30:14 UTC 2015 - i@marguerite.su - -- non-parallel build - ------------------------------------------------------------------- Sun Aug 10 09:14:36 UTC 2014 - i@marguerite.su diff --git a/brise.spec b/brise.spec index 984c5fb..6bd315f 100644 --- a/brise.spec +++ b/brise.spec @@ -24,8 +24,23 @@ License: GPL-3.0+ Group: System/I18n/Chinese Url: https://github.com/lotem/brise Source: brise-%{version}.tar.gz +Patch: Makefile-gdb.patch BuildRequires: kyotocabinet BuildRequires: librime-devel +# debug on OBS +BuildRequires: gdb +#BuildRequires: glibc-debuginfo +#BuildRequires: rime-debuginfo librime0-debuginfo +#BuildRequires: libboost_system1_53_0-debuginfo +#BuildRequires: libglog0-debuginfo +#BuildRequires: libstdc++6-debuginfo libgcc_s1-debuginfo +#BuildRequires: libboost_filesystem1_53_0-debuginfo +#BuildRequires: libboost_regex1_53_0-debuginfo +#BuildRequires: libboost_signals1_53_0-debuginfo +#BuildRequires: libboost_thread1_53_0-debuginfo +#BuildRequires: libyaml-cpp0_5-debuginfo +#BuildRequires: libkyotocabinet16-debuginfo +#BuildRequires: libicu51_2-debuginfo libz1-debuginfo BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -37,6 +52,7 @@ Brise is the input schemas collection of Rime. %prep %setup -q +%patch -p1 %build make -j1 From 4413f916eae858933aaa41756e4ae305b0f3f7d4ec8f67ba69722f7de3ae7305 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Tue, 11 Aug 2015 16:06:02 +0000 Subject: [PATCH 3/4] Accepting request 321964 from home:MargueriteSu:branches:M17N OBS-URL: https://build.opensuse.org/request/show/321964 OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=7 --- Makefile-gdb.patch | 13 ------------- brise.spec | 18 +----------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 Makefile-gdb.patch diff --git a/Makefile-gdb.patch b/Makefile-gdb.patch deleted file mode 100644 index bb5b977..0000000 --- a/Makefile-gdb.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: brise-0.35+git20140810/Makefile -=================================================================== ---- brise-0.35+git20140810.orig/Makefile -+++ brise-0.35+git20140810/Makefile -@@ -18,7 +18,7 @@ all: - @cp symbols.yaml ${DATA} - @cp preset/*.yaml ${DATA} - @cp supplement/*.yaml ${DATA} -- rime_deployer --build ${DATA} -+ gdb --eval-command='set height 0' --eval-command='run' --eval-command='bt' --eval-command='quit' --args rime_deployer --build ${DATA} - - # deprecated - essay.kct: diff --git a/brise.spec b/brise.spec index 6bd315f..a5ce535 100644 --- a/brise.spec +++ b/brise.spec @@ -24,23 +24,8 @@ License: GPL-3.0+ Group: System/I18n/Chinese Url: https://github.com/lotem/brise Source: brise-%{version}.tar.gz -Patch: Makefile-gdb.patch BuildRequires: kyotocabinet BuildRequires: librime-devel -# debug on OBS -BuildRequires: gdb -#BuildRequires: glibc-debuginfo -#BuildRequires: rime-debuginfo librime0-debuginfo -#BuildRequires: libboost_system1_53_0-debuginfo -#BuildRequires: libglog0-debuginfo -#BuildRequires: libstdc++6-debuginfo libgcc_s1-debuginfo -#BuildRequires: libboost_filesystem1_53_0-debuginfo -#BuildRequires: libboost_regex1_53_0-debuginfo -#BuildRequires: libboost_signals1_53_0-debuginfo -#BuildRequires: libboost_thread1_53_0-debuginfo -#BuildRequires: libyaml-cpp0_5-debuginfo -#BuildRequires: libkyotocabinet16-debuginfo -#BuildRequires: libicu51_2-debuginfo libz1-debuginfo BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -52,10 +37,9 @@ Brise is the input schemas collection of Rime. %prep %setup -q -%patch -p1 %build -make -j1 +make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install %{?_smp_mflags} From 08d79c34372af60f57ade3e7a045948cded87e380ed9480e2163c5a85c66ab0e Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Wed, 12 Aug 2015 02:30:52 +0000 Subject: [PATCH 4/4] Accepting request 322017 from home:MargueriteSu:branches:M17N OBS-URL: https://build.opensuse.org/request/show/322017 OBS-URL: https://build.opensuse.org/package/show/M17N/brise?expand=0&rev=8 --- _service | 13 +++++++++++++ brise-0.35+git20140810.tar.gz | 3 --- brise-0.36+git20150729.5c8435e.tar.xz | 3 +++ brise.changes | 5 +++++ brise.spec | 4 ++-- 5 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 _service delete mode 100644 brise-0.35+git20140810.tar.gz create mode 100644 brise-0.36+git20150729.5c8435e.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..9b1a2ad --- /dev/null +++ b/_service @@ -0,0 +1,13 @@ + + + https://github.com/rime/brise + 0.36+git%cd.%h + git + + + xz + *.tar + + + + diff --git a/brise-0.35+git20140810.tar.gz b/brise-0.35+git20140810.tar.gz deleted file mode 100644 index 242afd8..0000000 --- a/brise-0.35+git20140810.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4fdaa4adb3759ea9baeadf69c1b247703880e62cbbc5431e0632538062affd9 -size 14226944 diff --git a/brise-0.36+git20150729.5c8435e.tar.xz b/brise-0.36+git20150729.5c8435e.tar.xz new file mode 100644 index 0000000..528db52 --- /dev/null +++ b/brise-0.36+git20150729.5c8435e.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:020decdbd11b616574eb4fc8dbb352e980eab0ae0f6beb87e998e675d1d7fea9 +size 4941536 diff --git a/brise.changes b/brise.changes index a2f53c7..3b08e40 100644 --- a/brise.changes +++ b/brise.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 12 02:26:30 UTC 2015 - i@marguerite.su + +- update version 0.36+git20150729.5c8435e + ------------------------------------------------------------------- Sun Aug 10 09:14:36 UTC 2014 - i@marguerite.su diff --git a/brise.spec b/brise.spec index a5ce535..d26d49d 100644 --- a/brise.spec +++ b/brise.spec @@ -17,13 +17,13 @@ Name: brise -Version: 0.35+git20140810 +Version: 0.36+git20150729.5c8435e Release: 0 Summary: Rime Input Schemas Collection License: GPL-3.0+ Group: System/I18n/Chinese Url: https://github.com/lotem/brise -Source: brise-%{version}.tar.gz +Source: brise-%{version}.tar.xz BuildRequires: kyotocabinet BuildRequires: librime-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build