Navigation Menu

Skip to content

Commit

Permalink
package yum: stop to install epel-release explicitly
Browse files Browse the repository at this point in the history
It should be installed via groonga-release. If it's not installed, we
should fix groonga-release.
  • Loading branch information
kou committed Nov 28, 2016
1 parent 8049335 commit b2421fe
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions packages/yum/build-rpm.sh
Expand Up @@ -64,13 +64,17 @@ run cp /vagrant/tmp/${distribution}/*.spec rpmbuild/SPECS/

package_name=$(cd rpmbuild/SPECS; echo *.spec | sed -e 's/\.spec$//g')

run yum install -y epel-release
case ${distribution} in
fedora)
USE_MYSQLSERVICES_COMPAT=yes
run yum install -y mariadb-devel
;;
centos)
release_rpm=groonga-release-1.2.0-1.noarch.rpm
wget http://packages.groonga.org/${distribution}/${release_rpm}
run rpm -U ${release_rpm}
rm -f ${release_rpm}

case ${package_name} in
mysql55-${PACKAGE})
USE_MYSQLSERVICES_COMPAT=yes
Expand Down Expand Up @@ -112,12 +116,6 @@ case ${distribution} in
fi
;;
esac

release_rpm=groonga-release-1.2.0-1.noarch.rpm
wget http://packages.groonga.org/${distribution}/${release_rpm}
run rpm -U ${release_rpm}
rm -f ${release_rpm}
run yum makecache
;;
esac
run yum install -y ${DEPENDED_PACKAGES}
Expand Down

0 comments on commit b2421fe

Please sign in to comment.