Kouhei Sutou
null+****@clear*****
Mon Nov 28 10:12:25 JST 2016
Kouhei Sutou 2016-11-28 10:12:25 +0900 (Mon, 28 Nov 2016) New Revision: b2421fe592b7fb13f6db6f03a63af00ec0030847 https://github.com/mroonga/mroonga/commit/b2421fe592b7fb13f6db6f03a63af00ec0030847 Message: package yum: stop to install epel-release explicitly It should be installed via groonga-release. If it's not installed, we should fix groonga-release. Modified files: packages/yum/build-rpm.sh Modified: packages/yum/build-rpm.sh (+5 -7) =================================================================== --- packages/yum/build-rpm.sh 2016-11-25 16:23:33 +0900 (be346ed) +++ packages/yum/build-rpm.sh 2016-11-28 10:12:25 +0900 (96efa8e) @@ -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 @@ -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} -------------- next part -------------- HTML����������������������������...Download
