Hiroshi Hatake
null+****@clear*****
Sun Oct 26 15:51:52 JST 2014
Hiroshi Hatake 2014-10-26 15:51:52 +0900 (Sun, 26 Oct 2014) New Revision: 5eb000a1dad2f6698eb5de87ab6e6a62b42522a6 https://github.com/groonga/groonga/commit/5eb000a1dad2f6698eb5de87ab6e6a62b42522a6 Merged 916a708: Merge pull request #231 from cosmo0920/use-lz4-in-rpm Message: packages rpm: use lz4 instead of lzo Modified files: packages/rpm/centos/groonga.spec.in packages/rpm/fedora/groonga.spec.in Modified: packages/rpm/centos/groonga.spec.in (+5 -5) =================================================================== --- packages/rpm/centos/groonga.spec.in 2014-10-25 21:56:12 +0900 (de24a37) +++ packages/rpm/centos/groonga.spec.in 2014-10-26 15:51:52 +0900 (9abb07f) @@ -1,4 +1,4 @@ -%{!?use_lzo:%define use_lzo 0} +%{!?use_lz4:%define use_lz4 0} %{!?use_mecab:%define use_mecab 1} %{?additional_configure_options:%define use_additional_configure_options 1} %{!?additional_configure_options:%define use_additional_configure_options 0} @@ -20,8 +20,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) BuildRequires: mecab-devel %endif BuildRequires: zlib-devel -%if %{use_lzo} -BuildRequires: lzo-devel +%if %{use_lz4} +BuildRequires: lz4-devel %endif BuildRequires: pcre-devel Requires: %{name}-libs = %{version}-%{release} @@ -161,8 +161,8 @@ Munin plugins for Groonga --disable-static \ --with-package-platform=redhat \ --with-zlib \ -%if %{use_lzo} - --with-lzo \ +%if %{use_lz4} + --with-lz4 \ %endif %if %{use_mecab} --with-mecab \ Modified: packages/rpm/fedora/groonga.spec.in (+2 -2) =================================================================== --- packages/rpm/fedora/groonga.spec.in 2014-10-25 21:56:12 +0900 (31cc1c1) +++ packages/rpm/fedora/groonga.spec.in 2014-10-26 15:51:52 +0900 (7ca8a6b) @@ -12,7 +12,7 @@ Source0: http://packages.groonga.org/source/groonga/groonga-%{version}.tar.gz BuildRequires: mecab-devel BuildRequires: zlib-devel -BuildRequires: lzo-devel +BuildRequires: lz4-devel #BuildRequires: messagepack-devel #BuildRequires: zeromq-devel #BuildRequires: libevent-devel @@ -170,7 +170,7 @@ PHP language binding for Groonga %configure \ --disable-static \ --with-package-platform=fedora \ - --with-zlib --with-lzo \ + --with-zlib --with-lz4 \ --with-munin-plugins sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -------------- next part -------------- HTML����������������������������...Download