Kouhei Sutou
null+****@clear*****
Fri Nov 11 14:12:07 JST 2016
Kouhei Sutou 2016-11-11 14:12:07 +0900 (Fri, 11 Nov 2016) New Revision: ace7b01d65bb2dc0e4ebd7e5db9dbd044478518f https://github.com/groonga/groonga/commit/ace7b01d65bb2dc0e4ebd7e5db9dbd044478518f Message: package yum: update groonga-release RPM Now, it requires epel-release. EPEL related documents are also removed because EPEL is enabled automatically. Modified files: doc/source/install/centos.rst packages/yum/groonga-release.spec Modified: doc/source/install/centos.rst (+3 -48) =================================================================== --- doc/source/install/centos.rst 2016-11-11 12:36:32 +0900 (2f1242c) +++ doc/source/install/centos.rst 2016-11-11 14:12:07 +0900 (1240c09) @@ -19,7 +19,7 @@ CentOS 5 Install:: - % sudo rpm -ivh http://packages.groonga.org/centos/groonga-release-1.1.0-1.noarch.rpm + % sudo rpm -ivh http://packages.groonga.org/centos/groonga-release-1.2.0-1.noarch.rpm % sudo yum makecache % sudo yum install -y groonga @@ -36,29 +36,6 @@ There is a package that provides `Munin <http://munin-monitoring.org/>`_ plugins. If you want to monitor Groonga status by Munin, install groonga-munin-plugins package. -.. note:: - - Groonga-munin-plugins package requires munin-node package that - isn't included in the official CentOS repository. You need to - enable `Repoforge (RPMforge) <http://repoforge.org/>`_ repository - or `EPEL <http://fedoraproject.org/wiki/EPEL>`_ repository to - install it by ``yum``. - - Enable Repoforge (RPMforge) repository on i386 environment:: - - % wget http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el5.rf.i386.rpm - % sudo rpm -ivh rpmforge-release-0.5.2-2.el5.rf.i386.rpm - - Enable Repoforge (RPMforge) repository on x86_64 environment:: - - % wget http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el5.rf.x86_64.rpm - % sudo rpm -ivh rpmforge-release-0.5.2-2.el5.rf.x86_64.rpm - - Enable EPEL repository on any environment:: - - % wget http://download.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm - % sudo rpm -ivh epel-release-5-4.noarch.rpm - Install groonga-munin-plugins package:: % sudo yum install -y groonga-munin-plugins @@ -76,7 +53,7 @@ CentOS 6 Install:: - % sudo rpm -ivh http://packages.groonga.org/centos/groonga-release-1.1.0-1.noarch.rpm + % sudo rpm -ivh http://packages.groonga.org/centos/groonga-release-1.2.0-1.noarch.rpm % sudo yum makecache % sudo yum install -y groonga @@ -93,17 +70,6 @@ There is a package that provides `Munin <http://munin-monitoring.org/>`_ plugins. If you want to monitor Groonga status by Munin, install groonga-munin-plugins package. -.. note:: - - Groonga-munin-plugins package requires munin-node package that - isn't included in the official CentOS repository. You need to - enable `EPEL <http://fedoraproject.org/wiki/EPEL>`_ repository to - install it by ``yum``. - - Enable EPEL repository on any environment:: - - % sudo rpm -ivh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm - Install groonga-munin-plugins package:: % sudo yum install -y groonga-munin-plugins @@ -121,7 +87,7 @@ CentOS 7 Install:: - % sudo yum install -y http://packages.groonga.org/centos/groonga-release-1.1.0-1.noarch.rpm + % sudo yum install -y http://packages.groonga.org/centos/groonga-release-1.2.0-1.noarch.rpm % sudo yum install -y groonga .. include:: server-use.inc @@ -137,17 +103,6 @@ There is a package that provides `Munin <http://munin-monitoring.org/>`_ plugins. If you want to monitor Groonga status by Munin, install groonga-munin-plugins package. -.. note:: - - Groonga-munin-plugins package requires munin-node package that - isn't included in the official CentOS repository. You need to - enable `EPEL <http://fedoraproject.org/wiki/EPEL>`_ repository to - install it by ``yum``. - - Enable EPEL repository:: - - % sudo yum install -y epel-release - Install groonga-munin-plugins package:: % sudo yum install -y groonga-munin-plugins Modified: packages/yum/groonga-release.spec (+5 -1) =================================================================== --- packages/yum/groonga-release.spec 2016-11-11 12:36:32 +0900 (e2a1e91) +++ packages/yum/groonga-release.spec 2016-11-11 14:12:07 +0900 (1dcc80d) @@ -1,6 +1,6 @@ Summary: Groonga release files Name: groonga-release -Version: 1.1.0 +Version: 1.2.0 Release: 1 License: LGPLv2 URL: http://packages.groonga.org/ @@ -8,6 +8,7 @@ Source: groonga-release.tar.gz Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) BuildArchitectures: noarch +Requires: epel-release Obsoletes: groonga-repository <= 1.0.1-0 %description @@ -38,6 +39,9 @@ Groonga release files %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-groonga %changelog +* Tue Nov 29 2016 Kouhei Sutou <kou �� clear-code.com> +- Require epel-release for msgpack-devel, lz4-devel and libzstd-devel. + * Thu Nov 29 2012 HAYASHI Kentaro <hayashi �� clear-code.com> - Fix to specify the version of last released groonga-repository package as Obsoletes. -------------- next part -------------- HTML����������������������������...Download