Adding new CentOS and Fedora targets to accommodate availability.

Since Fedora and CentOS have different packages available by default,
break out the RPM lists so each can use the common list.

Since last working on this, the EPEL repo (https://fedoraproject.org/wiki/EPEL)
is available as a package within the normal CentOS repositories.

Also add CPAN target for CentOS for packages not available via EPEL
and create targets to install python-simplejson and ejabberd from source.

diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index 881bf7d..5449a46 100644 (file)
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -32,12 +32,6 @@ LBITS=$(shell getconf LONG_BIT)
 
 APT_TOOL=apt-get -yq
 
-CENTOS_VERSION="7"
-
-# CentOS needs the EPEL repository
-EPEL_HOST=http://dl.fedoraproject.org/pub/epel/${CENTOS_VERSION}/x86_64
-EPEL_PKG=epel-release-6-8.noarch.rpm
-
 # Debian dependencies
 DEBS =  \
        autoconf\
@@ -108,8 +102,6 @@ RPMS = \
        libmemcached \
        libmemcached-devel \
        libtool \
-       libxml-libxml-perl \
-       libxml-libxslt-perl \
        libxml2-devel \
        libxml2-python \
        libxslt-devel \
@@ -117,9 +109,6 @@ RPMS = \
        memcached \
        mod_perl \
        perl-Cache-Memcached \
-       perl-Class-DBI \
-       perl-Class-DBI-AbstractSearch \
-       perl-Class-DBI-SQLite \
        perl-DateTime-Format-Builder \
        perl-DateTime-Format-ISO8601 \
        perl-DateTime-Format-Mail \
@@ -133,7 +122,6 @@ RPMS = \
        perl-Module-Build \
        perl-Net-DNS \
        perl-Net-Server \
-       perl-SQL-Abstract-Limit \
        perl-Template-Toolkit \
        perl-Test-Deep \
        perl-Test-Exception \
@@ -149,7 +137,6 @@ RPMS = \
        python-dns \
        python-memcached \
        python-setuptools \
-       python-simplejson \
        readline-devel \
        tar
 
@@ -181,6 +168,19 @@ EXTRA_DEBS_UBUNTU_XENIAL = \
        apache2-dev \
        libncurses5-dev
 
+EXTRA_RPMS_FEDORA = \
+    perl-Class-DBI \
+    perl-Class-DBI-AbstractSearch \
+    perl-Class-DBI-SQLite \
+    perl-SQL-Abstract-Limit \
+       python-simplejson
+
+CPAN_MODULES_CENTOS = \
+       Class::DBI \
+       Class::DBI::AbstractSearch \
+       Class::DBI::SQLite \
+       SQL::Abstract::Limit
+
 # ----------------------------------------------------------------------------
 
 all: 
@@ -193,8 +193,8 @@ jessie: install_extra_debs_jessie debian_sys_config
 wheezy: install_extra_debs_wheezy debian_sys_config
 generic_debian: install_debs
 
-fedora: install_rpms
-centos: install_rpms
+fedora: install_rpms install_extra_rpms_fedora
+centos: install_epel install_rpms install_cpan_centos install_python_simplejson
 
 ubuntu-trusty: generic_ubuntu trusty apache_mpm_prefork_mods
 ubuntu-xenial: generic_ubuntu xenial apache_mpm_prefork_mods apache_perl_mod
@@ -248,14 +248,28 @@ apache_perl_mod:
 
 # CentOS
 install_epel:
-       if [ -n "$(uname -r | grep el6)" ]; then \
-               wget $(EPEL_HOST)/$(EPEL_PKG) ; \
-               rpm -Uvh $(EPEL_PKG) ;\
-       fi;
+       yum install epel-release
        yum update -y
 
+install_cpan_centos:
+       for m in $(CPAN_MODULES_CENTOS); do perl -MCPAN -e "install \"$$m\";"; done
+
 # Fedora/CentOS
 install_rpms:
        yum -y install $(RPMS)
 
+install_extra_rpms_fedora:
+       yum -y install $(EXTRA_RPMS_FEDORA)
+
+install_python_simplejson:
+       yum -y install gcc python-devel
+       curl -O https://pypi.python.org/packages/40/ad/52c1f3a562df3b210e8f165e1aa243a178c454ead65476a39fa3ce1847b6/simplejson-3.10.0.tar.gz
+       tar xzvf simplejson-3.10.0.tar.gz
+       cd simplejson-3.10.0
+       python setup.py install
+
+install_ejabberd:
+       curl -O https://www.process-one.net/downloads/downloads-action.php?file=/ejabberd/17.04/ejabberd-17.04-0.x86_64.rpm
+       rpm -i ejabberd-17.04-0.x86_64.rpm
+
 # vim:noet:sw=4:ts=4: