KanonConductor

changeset 29:33c1dd977439 centos5-support

remove old code to upgrade subversion 1.6
author tanacasino
date Sat, 26 Mar 2011 13:31:03 +0900
parents a8f5df57133e
children c6335712741b
files kanon-setup
diffstat 1 files changed, 5 insertions(+), 12 deletions(-) [+]
line diff
     1.1 --- a/kanon-setup	Sat Mar 26 02:07:50 2011 +0900
     1.2 +++ b/kanon-setup	Sat Mar 26 13:31:03 2011 +0900
     1.3 @@ -65,16 +65,16 @@
     1.4          yum -y install `cat pkglist.rhel6`
     1.5          ;;
     1.6      rhel5)
     1.7 -        cp -f resource/kanon.repo /etc/yum.repos.d/kanon.repo
     1.8 -        yum -y install subversion-1.6.15-1.el5
     1.9 -        yum -y install mod_dav_svn-1.6.15-1.el5
    1.10 -        # の実行
    1.11 -        # Add EPEL Repositories. For python26, python26-devel, python26-mod_wsgi.
    1.12 +        # Add EPEL Repository. For python26, python26-devel, python26-mod_wsgi.
    1.13          EPEL_RPM_URL="http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm"
    1.14          wget $EPEL_RPM_URL
    1.15          rpm -Uvh epel-release-5-4.noarch.rpm
    1.16          rm -f epel-release-5-4.noarch.rpm
    1.17          yum -y install `cat pkglist.rhel5`
    1.18 +
    1.19 +        # Add Kanon Repository. For Subversion 1.6 with Python26.
    1.20 +        cp -f resource/kanon.repo /etc/yum.repos.d/kanon.repo
    1.21 +        yum -y install subversion-1.6.15 mod_dav_svn-1.6.15
    1.22          ;;
    1.23      *)
    1.24          ;;
    1.25 @@ -108,13 +108,6 @@
    1.26  
    1.27  if [ "$OS" = "rhel5" ]
    1.28  then
    1.29 -    # Install Subversion.
    1.30 -    if [ "$UPGRADE_SVN" = "y" ]
    1.31 -    then
    1.32 -        ./subversion-16-upgrade.sh
    1.33 -    else
    1.34 -        yum -y install subversion mod_dav_svn
    1.35 -    fi
    1.36      # Install Extra Package for CentOS 5.X
    1.37      easy_install "mercurial==1.7.3"
    1.38      easy_install bzr