[Fusionforge-commits] FusionForge branch master updated. 98b51dcc558a22d292623af2a2bbc113283d01fa

Roland Mas lolando at fusionforge.org
Fri Oct 31 11:56:28 CET 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  98b51dcc558a22d292623af2a2bbc113283d01fa (commit)
       via  244376b98eea68e8cdf4f98cfa9d897e6636748e (commit)
       via  9517d03e83a58f5575ad8f3128bdc1cb8891a03a (commit)
      from  76d3e65e1c2f95d8e1bbedc1fd34a60071d4c5dc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 98b51dcc558a22d292623af2a2bbc113283d01fa
Author: Roland Mas <lolando at debian.org>
Date:   Fri Oct 31 11:56:13 2014 +0100

    Install java-1.7.0-openjdk on CentOS 7

diff --git a/autoinstall/run-testsuite.sh b/autoinstall/run-testsuite.sh
index 30048fd..9be3d3a 100755
--- a/autoinstall/run-testsuite.sh
+++ b/autoinstall/run-testsuite.sh
@@ -38,8 +38,13 @@ if [ -e /etc/debian_version ]; then
     apt-get -y install wget default-jre iceweasel
     apt-get -y install phpunit phpunit-selenium patch psmisc patch rsyslog
 else
-    yum -y install wget firefox java-1.6.0
-    yum install -y php-phpunit-PHPUnit php-phpunit-PHPUnit-Selenium psmisc patch
+    yum -y install wget firefox
+    if yum list java-1.7.0-openjdk >/dev/null 2>&1 ; then
+	yum install -y java-1.7.0-openjdk
+    else
+	yum install -y java-1.6.0
+    fi
+    yum install -y php-phpunit-PHPUnit php-phpunit-PHPUnit-Selenium psmisc patch net-tools
 fi
 
 # Install selenium (no packaged version available)

commit 244376b98eea68e8cdf4f98cfa9d897e6636748e
Author: Roland Mas <lolando at debian.org>
Date:   Fri Oct 31 10:31:02 2014 +0100

    Added backports for viewvc (and cvsgraph) and mediawiki

diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index 6b378d7..872fc51 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -112,13 +112,25 @@ EOF
     backport_rpm_from_fedora moin
 
     DEPS="php-channel-htmlpurifier"
-    REMOVEDEPS=
+    REMOVEDEPS=""
     backport_rpm_from_fedora php-htmlpurifier-htmlpurifier
 
     DEPS="dos2unix"
     REMOVEDEPS=$DEPS
     backport_rpm_from_fedora php-nusoap
 
+    DEPS="gcc gd-devel byacc freetype-devel libpng-devel libjpeg-devel"
+    REMOVEDEPS=$DEPS
+    backport_rpm_from_fedora cvsgraph
+
+    DEPS="python-devel python-pygments"
+    REMOVEDEPS=$DEPS
+    backport_rpm_from_fedora viewvc
+
+    DEPS=""
+    REMOVEDEPS=$DEPS
+    backport_rpm_from_fedora mediawiki
+
     # TODO: postfix: rebuild from RHEL/CentOS sources with pgsql enabled,
     # so we can test mta-postfix
 }

commit 9517d03e83a58f5575ad8f3128bdc1cb8891a03a
Author: Roland Mas <lolando at debian.org>
Date:   Fri Oct 31 10:30:35 2014 +0100

    Refactor code backporting RPMs from Fedora

diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index ed25bba..6b378d7 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -46,6 +46,27 @@ function backports_deb {
     fi
 }
 
+function backport_rpm_from_fedora {
+    target=$1
+
+    if yum list $target >/dev/null 2>&1; then
+	yum install -y $target
+    else
+	yumdownloader --enablerepo=fedora --source $target
+	for DEP in $DEPS ; do
+	    if ! yum install -y $DEP ; then
+		yumdownloader --enablerepo=fedora $DEP
+		yum install -y $DEP-*.noarch.rpm
+	    fi
+	done
+	rpmbuild --rebuild $target-*.src.rpm
+	if [ -n "$REMOVEDEPS" ] ; then
+	    yum remove -y $REMOVEDEPS
+	fi
+	yum install -y ~/rpmbuild/RPMS/*/$target-[0-9]*.*.rpm
+    fi
+}
+
 
 function backports_rpm {
     # Fedora/RHEL/CentOS version:
@@ -82,57 +103,21 @@ EOF
 	yum install -y yum-utils  # yumdownloader
     fi
 
-    if yum list libnss-pgsql >/dev/null 2>&1; then
-	yum install -y libnss-pgsql
-    else
-	# libnss-pgsql: id., plus http://yum.postgresql.org/8.4/redhat/rhel-5-x86_64/
-	yumdownloader --enablerepo=fedora --source libnss-pgsql
-	DEPS="gcc postgresql-devel xmlto"
-	yum install -y $DEPS
-	rpmbuild --rebuild libnss-pgsql-*.src.rpm
-	yum remove -y $DEPS
-	rpm -ivh ~/rpmbuild/RPMS/x86_64/libnss-pgsql-*.x86_64.rpm
-    fi
+    DEPS="gcc postgresql-devel xmlto"
+    REMOVEDEPS=$DEPS
+    backport_rpm_from_fedora libnss-pgsql
 
-    if yum list moin >/dev/null 2>&1; then
-	yum install -y moin
-    else
-	# moin: no available package for RHEL; though 'moin' is available in Fedora
-	yumdownloader --enablerepo=fedora --source moin
-	DEPS="python-devel"
-	yum install -y $DEPS
-	rpmbuild --rebuild moin-*.src.rpm
-	yum remove -y $DEPS
-	rpm -ivh ~/rpmbuild/RPMS/noarch/moin-*.noarch.rpm
-    fi
+    DEPS="python-devel"
+    REMOVEDEPS=$DEPS
+    backport_rpm_from_fedora moin
 
-    if yum list php-htmlpurifier-htmlpurifier >/dev/null 2>&1; then
-	yum install -y php-htmlpurifier-htmlpurifier
-    else
-	# php-htmlpurifier-htmlpurifier: no available package for RHEL, but available in Fedora
-	yumdownloader --enablerepo=fedora --source php-htmlpurifier-htmlpurifier
-	DEPS="php-channel-htmlpurifier"  # for v4.3.0-6.fc20
-	for DEP in $DEPS ; do
-	    if ! yum install -y $DEP ; then
-		yumdownloader --enablerepo=fedora $DEP
-		yum install -y $DEP-*.noarch.rpm
-	    fi
-	done
-	rpmbuild --rebuild php-htmlpurifier-htmlpurifier-*.src.rpm
-	yum install -y ~/rpmbuild/RPMS/noarch/php-htmlpurifier-htmlpurifier-*.noarch.rpm
-    fi
+    DEPS="php-channel-htmlpurifier"
+    REMOVEDEPS=
+    backport_rpm_from_fedora php-htmlpurifier-htmlpurifier
 
-    if yum list php-nusoap >/dev/null 2>&1; then
-	yum install -y php-nusoap
-    else
-	# php-nusoap: no available package for RHEL, but available in Fedora
-	yumdownloader --enablerepo=fedora --source php-nusoap
-	DEPS="dos2unix"
-	yum install -y $DEPS
-	rpmbuild --rebuild php-nusoap-*.src.rpm
-	yum remove -y $DEPS
-	yum install -y ~/rpmbuild/RPMS/noarch/php-nusoap-*.noarch.rpm
-    fi
+    DEPS="dos2unix"
+    REMOVEDEPS=$DEPS
+    backport_rpm_from_fedora php-nusoap
 
     # TODO: postfix: rebuild from RHEL/CentOS sources with pgsql enabled,
     # so we can test mta-postfix

-----------------------------------------------------------------------

Summary of changes:
 autoinstall/common-backports |   93 ++++++++++++++++++++----------------------
 autoinstall/run-testsuite.sh |    9 +++-
 2 files changed, 52 insertions(+), 50 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list