diff --git a/setup.cfg b/setup.cfg index b1bc001f80b..f60117ccdbb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,6 +5,7 @@ post-install = setup/redhat/postinstall.sh requires = babel libxslt-python + pychart pyparsing python-dateutil python-decorator @@ -30,14 +31,7 @@ requires = pytz # ------------------------------------------------------------------- -# CentOS 7 notes +# RedHat 7 notes # ------------------------------------------------------------------- -# -# These libraries can be installed as system packages thanks to the -# Fedora EPEL repo (https://fedoraproject.org/wiki/EPEL): -# rpm -ivh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-2.noarch.rpm -# yum update -y && yum upgrade -y -# -# Unfortunately, all the needed packages are not yet ported to EPEL7. You can install them with pip: -# yum install python-pip gcc python-devel -y -# pip install pydot pyPdf vatnumber xlwt http://download.gna.org/pychart/PyChart-1.39.tar.gz +# Most of the Odoo dependencies are available on the EPEL repository. +# yum install epel-release \ No newline at end of file diff --git a/setup/package.py b/setup/package.py index ec95448bcf6..f803c688676 100755 --- a/setup/package.py +++ b/setup/package.py @@ -327,8 +327,6 @@ def test_rpm(o): # Dependencies centos7.system('yum install -d 0 -e 0 epel-release -y') centos7.system('yum update -d 0 -e 0 -y') - centos7.system('yum install -d 0 -e 0 python-pip gcc python-devel -y') - centos7.system('pip install pydot pyPdf vatnumber xlwt http://download.gna.org/pychart/PyChart-1.39.tar.gz') # Manual install/start of postgres centos7.system('yum install -d 0 -e 0 postgresql postgresql-server postgresql-libs postgresql-contrib postgresql-devel -y') centos7.system('mkdir -p /var/lib/postgres/data') diff --git a/setup/redhat/postinstall.sh b/setup/redhat/postinstall.sh index d12621bf8a0..ccc8fd63ebe 100644 --- a/setup/redhat/postinstall.sh +++ b/setup/redhat/postinstall.sh @@ -54,3 +54,4 @@ ExecStart=/usr/bin/odoo.py --config=/etc/odoo/openerp-server.conf [Install] WantedBy=multi-user.target EOF +easy_install pyPdf vatnumber pydot