From: Kenji O. <ok...@cl...> - 2013-04-30 01:56:58
|
Kenji Okimoto 2013-04-30 09:58:08 +0900 (Tue, 30 Apr 2013) New Revision: fabc41a29dbf7b8f8dd424273da69f666da7954a https://github.com/milter-manager/milter-manager/commit/fabc41a29dbf7b8f8dd424273da69f666da7954a Message: package yum: Use EPEL instead of rpmforge(repoforge) There is no munin packages on rpmforge(repoforge). NOTE: EPEL doesn't have milter-greylist. Modified files: package/yum/Makefile.am package/yum/build-in-chroot.sh package/yum/build-rpm.sh Modified: package/yum/Makefile.am (+4 -2) =================================================================== --- package/yum/Makefile.am 2013-04-30 09:49:44 +0900 (f30e73d) +++ package/yum/Makefile.am 2013-04-30 09:58:08 +0900 (d25d096) @@ -5,8 +5,9 @@ ARCHITECTURES = i386 x86_64 CHROOT_BASE = /var/lib/chroot BASE_URL_PREFIX = http://downloads.sourceforge.net/project/$(PACKAGE) HAVE_DEVELOPMENT_BRANCH = yes -USE_RPMFORGE = yes +USE_RPMFORGE = no USE_ATRPMS = no +USE_EPEL = yes release: build sign update upload @@ -51,7 +52,8 @@ build-in-chroot: '$(DISTRIBUTIONS)' \ '$(HAVE_DEVELOPMENT_BRANCH)' \ '$(USE_RPMFORGE)' \ - '$(USE_ATRPMS)' + '$(USE_ATRPMS)' \ + '$(USE_EPEL)' build-release-rpm: RPM-GPG-KEY-$(PACKAGE) ./build-release-rpm.sh \ Modified: package/yum/build-in-chroot.sh (+3 -1) =================================================================== --- package/yum/build-in-chroot.sh 2013-04-30 09:49:44 +0900 (6b5619b) +++ package/yum/build-in-chroot.sh 2013-04-30 09:58:08 +0900 (3884bad) @@ -1,7 +1,7 @@ #!/bin/sh if [ $# != 10 ]; then - echo "Usage: $0 PACKAGE VERSION SOURCE_BASE_NAME SPEC_DIR CHROOT_BASE ARCHITECTURES DISTRIBUTIONS HAVE_DEVELOPMENT_BRANCH USE_RPMFORGE USE_ATRPMS" + echo "Usage: $0 PACKAGE VERSION SOURCE_BASE_NAME SPEC_DIR CHROOT_BASE ARCHITECTURES DISTRIBUTIONS HAVE_DEVELOPMENT_BRANCH USE_RPMFORGE USE_ATRPMS USE_EPEL" echo " e.g.: $0 milter-manager 1.1.1 ../milter-manager ../rpm /var/lib/chroot 'i386 x86_64' 'fedora centos' yes no no" exit 1 fi @@ -16,6 +16,7 @@ DISTRIBUTIONS=$7 HAVE_DEVELOPMENT_BRANCH=$8 USE_RPMFORGE=$9 USE_ATRPMS=$10 +USE_EPEL=$11 PATH=/usr/local/sbin:/usr/sbin:$PATH @@ -124,6 +125,7 @@ build() ${CHROOT_BASE}/$target/tmp/depended-packages run echo $USE_RPMFORGE > ${CHROOT_BASE}/$target/tmp/build-use-rpmforge run echo $USE_ATRPMS > ${CHROOT_BASE}/$target/tmp/build-use-atrpms + run echo $USE_EPEL > ${CHROOT_BASE}/$target/tmp/build-use-epel run cp ${script_base_dir}/${PACKAGE}-build-options \ ${CHROOT_BASE}/$target/tmp/build-options run cp ${script_base_dir}/build-rpm.sh ${CHROOT_BASE}/$target/tmp/ Modified: package/yum/build-rpm.sh (+19 -0) =================================================================== --- package/yum/build-rpm.sh 2013-04-30 09:49:44 +0900 (7b3c9c2) +++ package/yum/build-rpm.sh 2013-04-30 09:58:08 +0900 (2a54e7d) @@ -9,6 +9,7 @@ USER_NAME=$(cat /tmp/build-user) DEPENDED_PACKAGES=$(cat /tmp/depended-packages) USE_RPMFORGE=$(cat /tmp/build-use-rpmforge) USE_ATRPMS=$(cat /tmp/build-use-atrpms) +USE_EPEL=$(cat /tmp/build-use-epel) BUILD_OPTIONS=$(cat /tmp/build-options) BUILD_SCRIPT=/tmp/build-${PACKAGE}.sh BUILD_RUBY_SCRIPT=/tmp/build-ruby.sh @@ -79,6 +80,24 @@ EOF yum_options="$yum_options --enablerepo=atrpms" fi +if test "$USE_EPEL" = "yes"; then + if ! rpm -q epel-release > /dev/null 2>&1; then + case $distribution_version in + 5.*) + epel_url=http://ftp.iij.ad.jp/pub/linux/fedora/epel/5/i386/epel-release-5-4.noarch.rpm + ;; + 6.*) + epel_url=http://ftp.iij.ad.jp/pub/linux/fedora/epel/6/i386/epel-release-6-8.noarch.rpm + ;; + esac + run wget $epel_url + run rpm -Uvh $(basename $epel_url) + run rm $(basename $epel_url) + sed -i'' -e 's/enabled = 1/enabled = 0/g' /etc/yum.repos.d/rpmforge.repo + fi + yum_options="$yum_options --enablerepo=epel" +fi + run yum update ${yum_options} -y run yum install ${yum_options} -y rpm-build tar ${DEPENDED_PACKAGES} run yum clean ${yum_options} packages |