HAYASHI Kentaro
null+****@clear*****
Wed Jan 16 13:58:42 JST 2013
HAYASHI Kentaro 2013-01-16 13:58:42 +0900 (Wed, 16 Jan 2013) New Revision: 1ec0811f44423264a1af569629566549ee3c5d11 https://github.com/groonga/groonga/commit/1ec0811f44423264a1af569629566549ee3c5d11 Log: rpm: add virtual package 'mecab-dic' dependency to groonga-tokenizer-mecab Added files: packages/yum/patches/mecab-ipadic-provides-mecab-dic.diff packages/yum/patches/mecab-jumandic-provides-mecab-dic.diff Modified files: packages/rpm/centos/groonga.spec.in packages/rpm/fedora/groonga.spec.in packages/yum/build-in-chroot.sh packages/yum/build-rpm.sh Modified: packages/rpm/centos/groonga.spec.in (+1 -0) =================================================================== --- packages/rpm/centos/groonga.spec.in 2013-01-16 13:28:42 +0900 (6a68c5b) +++ packages/rpm/centos/groonga.spec.in 2013-01-16 13:58:42 +0900 (3ba1a82) @@ -119,6 +119,7 @@ Libraries and header files for groonga Summary: MeCab tokenizer for groonga Group: Applications/Text Requires: %{name}-libs = %{version}-%{release} +Requires: mecab-dic %description tokenizer-mecab MeCab tokenizer for groonga Modified: packages/rpm/fedora/groonga.spec.in (+1 -0) =================================================================== --- packages/rpm/fedora/groonga.spec.in 2013-01-16 13:28:42 +0900 (d8165fc) +++ packages/rpm/fedora/groonga.spec.in 2013-01-16 13:58:42 +0900 (a43ce92) @@ -118,6 +118,7 @@ Libraries and header files for groonga Summary: MeCab tokenizer for groonga Group: Applications/Text Requires: %{name}-libs = %{version}-%{release} +Requires: mecab-dic %description tokenizer-mecab MeCab tokenizer for groonga Modified: packages/yum/build-in-chroot.sh (+1 -0) =================================================================== --- packages/yum/build-in-chroot.sh 2013-01-16 13:28:42 +0900 (3a4f9ac) +++ packages/yum/build-in-chroot.sh 2013-01-16 13:58:42 +0900 (39eabf9) @@ -128,6 +128,7 @@ build() run cp ${script_base_dir}/${PACKAGE}-build-options \ ${CHROOT_BASE}/$target/tmp/build-options run cp ${script_base_dir}/build-rpm.sh ${CHROOT_BASE}/$target/tmp/ + run_sudo cp patches/*.diff ${CHROOT_BASE}/$target/tmp/ run_sudo rm -rf $rpm_dir $srpm_dir run_sudo su -c "chroot ${CHROOT_BASE}/$target /tmp/build-rpm.sh" run mkdir -p $binary_pool_dir Modified: packages/yum/build-rpm.sh (+8 -0) =================================================================== --- packages/yum/build-rpm.sh 2013-01-16 13:28:42 +0900 (3748719) +++ packages/yum/build-rpm.sh 2013-01-16 13:58:42 +0900 (ba505f9) @@ -114,6 +114,14 @@ if [ \$? -ne 0 ]; then fi rpm2cpio \$srpm | cpio -id rm \$srpm +case \$srpm in + mecab-ipadic*) + patch -p0 < /tmp/mecab-ipadic-provides-mecab-dic.diff + ;; + mecab-jumandic-*) + patch -p0 < /tmp/mecab-jumandic-provides-mecab-dic.diff + ;; +esac mv *.spec ~/rpmbuild/SPECS/ mv * ~/rpmbuild/SOURCES/ cd .. Added: packages/yum/patches/mecab-ipadic-provides-mecab-dic.diff (+10 -0) 100644 =================================================================== --- /dev/null +++ packages/yum/patches/mecab-ipadic-provides-mecab-dic.diff 2013-01-16 13:58:42 +0900 (79df811) @@ -0,0 +1,10 @@ +--- mecab-ipadic.spec.orig 2013-01-15 21:57:41.969580098 -0500 ++++ mecab-ipadic.spec 2013-01-15 21:58:32.629580230 -0500 +@@ -27,6 +27,7 @@ + + BuildRequires: mecab-devel >= %{mecabver} + Requires: mecab >= %{mecabver} ++Provides: mecab-dic + + %description + MeCab IPA is a dictionary for MeCab using CRF estimation Added: packages/yum/patches/mecab-jumandic-provides-mecab-dic.diff (+10 -0) 100644 =================================================================== --- /dev/null +++ packages/yum/patches/mecab-jumandic-provides-mecab-dic.diff 2013-01-16 13:58:42 +0900 (edfb899) @@ -0,0 +1,10 @@ +--- mecab-jumandic.spec.orig 2013-01-15 21:57:48.337580114 -0500 ++++ mecab-jumandic.spec 2013-01-15 21:58:47.513580269 -0500 +@@ -20,6 +20,7 @@ + + BuildRequires: mecab-devel + Requires: mecab ++Provides: mecab-dic + + %description + MeCab JUMAN is a dictionary for MeCab using CRF estimation -------------- next part -------------- HTML����������������������������...Descargar
