Kenji Okimoto
null+****@clear*****
Tue Jul 3 14:50:20 JST 2018
Kenji Okimoto 2018-07-03 14:50:20 +0900 (Tue, 03 Jul 2018) New Revision: d6330bbe65e6c55079cf1d57f00b49b8629cff3e https://github.com/milter-manager/milter-manager/commit/d6330bbe65e6c55079cf1d57f00b49b8629cff3e Message: package yum: Use epel-release package instead of rpm URL Because recent CentOS6/7 extras repo has epel-release. Modified files: package/yum/build-rpm.sh Modified: package/yum/build-rpm.sh (+5 -16) =================================================================== --- package/yum/build-rpm.sh 2018-07-03 14:19:49 +0900 (57cfa831) +++ package/yum/build-rpm.sh 2018-07-03 14:50:20 +0900 (b85b51b1) @@ -90,22 +90,11 @@ fi if test "$USE_EPEL" = "yes"; then if ! rpm -q epel-release > /dev/null 2>&1; then - epel_url= - case $distribution_version in - 6.*) - epel_url=http://ftp.iij.ad.jp/pub/linux/fedora/epel/6/i386/epel-release-6-8.noarch.rpm - ;; - 7.*) - epel_url=http://ftp.iij.ad.jp/pub/linux/fedora/epel/7/x86_64/e/epel-release-7-6.noarch.rpm - ;; - esac - if test -n "$epel_url"; then - run yum update ${yum_options} -y - run yum install ${yum_options} -y wget pyliblzma ca-certificates - run yum ${yum_options} clean packages - run yum install -y $epel_url - sed -i'' -e 's/enabled = 1/enabled = 0/g' /etc/yum.repos.d/epel.repo - fi + run yum update ${yum_options} -y + run yum install ${yum_options} -y wget pyliblzma ca-certificates + run yum ${yum_options} clean packages + run yum install -y epel-release + sed -i'' -e 's/enabled = 1/enabled = 0/g' /etc/yum.repos.d/epel.repo fi yum_options="$yum_options --enablerepo=epel" fi -------------- next part -------------- An HTML attachment was scrubbed... URL: https://lists.osdn.me/mailman/archives/milter-manager-commit/attachments/20180703/4e71fecb/attachment-0001.htm
