[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 282d9aff2469b628689596202c61929aef364453

Roland Mas lolando at fusionforge.org
Mon Dec 15 14:49:54 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, Branch_5_3 has been updated
       via  282d9aff2469b628689596202c61929aef364453 (commit)
      from  b72fdd967f573ee1287a87811b06bae9bd142c53 (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 282d9aff2469b628689596202c61929aef364453
Author: Roland Mas <lolando at debian.org>
Date:   Mon Dec 15 14:49:44 2014 +0100

    Install PHPUnit from "Les RPM de Remi" repository

diff --git a/3rd-party/php-htmlpurifier/php-htmlpurifier.spec b/3rd-party/php-htmlpurifier/php-htmlpurifier.spec
index 83f8b22..344aed3 100644
--- a/3rd-party/php-htmlpurifier/php-htmlpurifier.spec
+++ b/3rd-party/php-htmlpurifier/php-htmlpurifier.spec
@@ -12,7 +12,7 @@ Source: http://htmlpurifier.org/releases/htmlpurifier-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildArch: noarch
-Requires: php
+Requires: php >= 5.0.5
 
 Obsoletes: htmlpurifier
 
diff --git a/src/fusionforge.spec b/src/fusionforge.spec
index 53cded2..9c8e129 100644
--- a/src/fusionforge.spec
+++ b/src/fusionforge.spec
@@ -58,7 +58,7 @@ URL: http://www.fusionforge.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Packager: Alain Peyrat <aljeux at free.fr>
 
-Requires: httpd, mod_dav_svn, mod_ssl, mod_php, php-pgsql, php-gd, php-mbstring, mailman
+Requires: httpd, mod_dav_svn, mod_ssl, php, php-pgsql, php-gd, php-mbstring, mailman
 Requires: postgresql >= 8.3
 Requires: postgresql-server >= 8.3
 Requires: postfix, openssh, inetd, which
diff --git a/src/install/deps b/src/install/deps
index 0e9692f..af921ef 100644
--- a/src/install/deps
+++ b/src/install/deps
@@ -61,7 +61,7 @@ deps_redhat() {
 				packagelist="httpd php mailman cvs $pg $pg-libs $pg-server $pg-contrib perl-URI php-pgsql subversion mod_dav_svn postfix rcs php-gd mod_ssl wget openssh which liberation-fonts php-htmlpurifier php-mbstring poppler-utils php-pear-HTTP_WebDAV_Server antiword shared-mime-info rsync git gitweb"
 				;;
 			5|el5*)
-				packagelist="httpd php53 mailman cvs $pg $pg-libs $pg-server $pg-contrib perl-URI php53-pgsql subversion mod_dav_svn postfix rcs php53-gd mod_ssl wget openssh which liberation-fonts php-htmlpurifier php53-mbstring poppler-utils php-pecl-zip php-pear-HTTP_WebDAV_Server antiword php-pecl-Fileinfo shared-mime-info rsync git gitweb"
+				packagelist="httpd php mailman cvs $pg $pg-libs $pg-server $pg-contrib perl-URI php-pgsql subversion mod_dav_svn postfix rcs php-gd mod_ssl wget openssh which liberation-fonts php-htmlpurifier php-mbstring poppler-utils php-pecl-zip php-pear-HTTP_WebDAV_Server antiword php-pecl-Fileinfo shared-mime-info rsync git gitweb"
 				;;
 			*)
 				msg red "Target version unknown. Die here"
diff --git a/tests/scripts/fusionforge-build-and-test-rpm.sh b/tests/scripts/fusionforge-build-and-test-rpm.sh
index fd5dcaa..994debb 100755
--- a/tests/scripts/fusionforge-build-and-test-rpm.sh
+++ b/tests/scripts/fusionforge-build-and-test-rpm.sh
@@ -50,22 +50,19 @@ case $VM in
     centos5|centos6)
 	setup_epel_repo $@
 	ssh root@$HOST "yum -y --enablerepo=epel install cronolog"
-	;;
-esac
-
-case $VM in
-    centos5)
-	ssh root@$HOST "yum -y install php53"
-	ssh root@$HOST "yum -y install wget ; wget https://phar.phpunit.de/phpunit.phar ; chmod +x phpunit.phar ; mv phpunit.phar /usr/local/bin/phpunit"
-	;;
-    centos6)
-	ssh root@$HOST "yum -y --enablerepo=epel install php-pear-PHPUnit php-phpunit-PHPUnit-Selenium"
+	ssh root@$HOST "yum -y --enablerepo=epel install php-phpunit-PHPUnit-Selenium"
 	;;
 esac
 
 ssh root@$HOST "yum install -y rsync"
 
 setup_redhat_3rdparty_repo
+case $VM in
+    centos5|centos6)
+	ssh root@$HOST "rpm -i http://rpms.famillecollet.com/enterprise/remi-release-5.rpm"
+	ssh root@$HOST "yum -y --enablerepo=remi install php-phpunit-PHPUnit"
+	;;
+esac
 
 sleep 5
 ssh root@$HOST "FFORGE_DB=$DB_NAME FFORGE_USER=gforge FFORGE_ADMIN_USER=$FORGE_ADMIN_USERNAME FFORGE_ADMIN_PASSWORD=$FORGE_ADMIN_PASSWORD export FFORGE_DB FFORGE_USER FFORGE_ADMIN_USER FFORGE_ADMIN_PASSWORD; yum install -y --skip-broken fusionforge fusionforge-plugin-scmsvn fusionforge-plugin-online_help fusionforge-plugin-extratabs fusionforge-plugin-authldap fusionforge-plugin-scmgit fusionforge-plugin-blocks"
diff --git a/tests/scripts/fusionforge-build-and-test-src-cos.sh b/tests/scripts/fusionforge-build-and-test-src-cos.sh
index 514f97f..4bca5d4 100755
--- a/tests/scripts/fusionforge-build-and-test-src-cos.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-cos.sh
@@ -36,16 +36,7 @@ case $VM in
     centos5|centos6)
 	setup_epel_repo $@
 	ssh root@$HOST "yum -y --enablerepo=epel install cronolog"
-	;;
-esac
-
-case $VM in
-    centos5)
-	ssh root@$HOST "yum -y install php53"
-	ssh root@$HOST "yum -y install wget ; wget https://phar.phpunit.de/phpunit.phar ; chmod +x phpunit.phar ; mv phpunit.phar /usr/local/bin/phpunit"
-	;;
-    centos6)
-	ssh root@$HOST "yum -y --enablerepo=epel install php-pear-PHPUnit php-phpunit-PHPUnit-Selenium"
+	ssh root@$HOST "yum -y --enablerepo=epel install php-phpunit-PHPUnit-Selenium"
 	;;
 esac
 

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

Summary of changes:
 3rd-party/php-htmlpurifier/php-htmlpurifier.spec    |    2 +-
 src/fusionforge.spec                                |    2 +-
 src/install/deps                                    |    2 +-
 tests/scripts/fusionforge-build-and-test-rpm.sh     |   17 +++++++----------
 tests/scripts/fusionforge-build-and-test-src-cos.sh |   11 +----------
 5 files changed, 11 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list