Kouhei Sutou
null+****@clear*****
Mon Nov 7 23:54:41 JST 2016
Kouhei Sutou 2016-11-07 23:54:41 +0900 (Mon, 07 Nov 2016) New Revision: ec326093aff659870c6e721d6bb1e90b440173af https://github.com/pgroonga/pgroonga/commit/ec326093aff659870c6e721d6bb1e90b440173af Message: rpm centos7: enable msgpack for WAL support It requires EPEL. Modified files: packages/yum/build-rpm.sh packages/yum/postgresql-pgroonga.spec.in Modified: packages/yum/build-rpm.sh (+5 -0) =================================================================== --- packages/yum/build-rpm.sh 2016-11-07 23:03:16 +0900 (870ebb7) +++ packages/yum/build-rpm.sh 2016-11-07 23:54:41 +0900 (5c27fe3) @@ -68,6 +68,11 @@ else fi run cp /vagrant/tmp/${distribution}/${PACKAGE}.spec rpmbuild/SPECS/ +if grep -q -E 'Requires:\s+msgpack' rpmbuild/SPECS/${PACKAGE}.spec; then + run yum install -y epel-release + run yum install -y msgpack-devel +fi + run rpmbuild -ba ${rpmbuild_options} rpmbuild/SPECS/${PACKAGE}.spec run mv rpmbuild/RPMS/*/* "${rpm_dir}/" Modified: packages/yum/postgresql-pgroonga.spec.in (+13 -0) =================================================================== --- packages/yum/postgresql-pgroonga.spec.in 2016-11-07 23:03:16 +0900 (706b8a0) +++ packages/yum/postgresql-pgroonga.spec.in 2016-11-07 23:54:41 +0900 (2b9ca29) @@ -1,5 +1,9 @@ # -*- rpm -*- +%define _centos_ver %{?centos_ver:%{centos_ver}}%{!?centos_ver:5} + +%define _use_msgpack %{?use_msgpack:%{use_msgpack}}%{!?use_msgpack:%{_centos_ver} >= 7} + %define pg_version @PG_VERSION@ %define pg_package_version @PG_PACKAGE_VERSION@ %define pg_prefix /usr/pgsql-%{pg_version} @@ -19,8 +23,14 @@ Source0: http://packages.groonga.org/source/pgroonga/pgroonga-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) BuildRequires: groonga-devel +%if %{_use_msgpack} +BuildRequires: msgpack-devel +%endif BuildRequires: postgresql%{pg_package_version}-devel Requires: groonga-libs >= 6.0.7 +%if %{_use_msgpack} +Requires: msgpack +%endif Requires: postgresql%{pg_package_version}-server %description @@ -34,6 +44,9 @@ It is based on Groonga. %build PATH="%{pg_bindir}:$PATH" \ make \ +%if %{_use_msgpack} + HAVE_MSGPACK=1 \ +%endif enable_rpath=no \ %{?_smp_mflags} -------------- next part -------------- HTML����������������������������...Download