[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 03cc23f936998c5ee32bbd2a5b56f6ecba8aaa9e

Roland Mas lolando at fusionforge.org
Tue Aug 5 14:57:11 CEST 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  03cc23f936998c5ee32bbd2a5b56f6ecba8aaa9e (commit)
      from  b3d55bf3482e2eb124db8334f052edb3bf16000d (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 03cc23f936998c5ee32bbd2a5b56f6ecba8aaa9e
Author: Roland Mas <lolando at debian.org>
Date:   Tue Aug 5 14:57:03 2014 +0200

    Disable shipping of plugin-scmgit-dav.inc, re-enable scmgit plugin in RPM testsuite

diff --git a/src/fusionforge.spec b/src/fusionforge.spec
index 85a0d30..c0e8520 100644
--- a/src/fusionforge.spec
+++ b/src/fusionforge.spec
@@ -649,7 +649,7 @@ done
 %{__ln_s} /usr/share/gitweb/gitweb.cgi $RPM_BUILD_ROOT%{FORGE_PLUGINS_LIB_DIR}/scmgit/www/cgi-bin/gitweb.cgi
 %{__ln_s} /usr/share/gitweb/static/gitweb.css $RPM_BUILD_ROOT%{FORGE_PLUGINS_LIB_DIR}/scmgit/www/gitweb.css
 %{__ln_s} /usr/share/gitweb/static/gitweb.js $RPM_BUILD_ROOT%{FORGE_PLUGINS_LIB_DIR}/scmgit/www/gitweb.js
-
+%{__rm} $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/httpd.conf.d/plugin-scmgit-dav.inc
 # plugin: scmhg
 
 # plugin: blocks
@@ -1071,7 +1071,7 @@ fi
 
 %files plugin-scmgit
 %config(noreplace) %{FORGE_CONF_DIR}/config.ini.d/scmgit.ini
-%{FORGE_CONF_DIR}/httpd.conf.d/plugin-scmgit-dav.inc
+# %{FORGE_CONF_DIR}/httpd.conf.d/plugin-scmgit-dav.inc
 %{FORGE_PLUGINS_LIB_DIR}/scmgit
 %{FORGE_DIR}/www/plugins/scmgit
 
diff --git a/tests/RPMCentosTests.php b/tests/RPMCentosTests.php
index 09330a8..112c845 100644
--- a/tests/RPMCentosTests.php
+++ b/tests/RPMCentosTests.php
@@ -33,7 +33,7 @@ class RPMCentosTests
 		$suite->addTestFiles(glob("func/PluginsOnlineHelp/*Test.php"));
 //		$suite->addTestFiles(glob("func/SSH/*Test.php"));
 //		$suite->addTestFiles(glob("func/PluginsScmBzr/*Test.php"));
-//		$suite->addTestFiles(glob("func/PluginsScmGit/gitWUITest.php"));
+		$suite->addTestFiles(glob("func/PluginsScmGit/gitWUITest.php"));
 		$suite->addTestFiles(glob("func/PluginsScmSvn/svnWUITest.php"));
 		$suite->addTestFiles(glob("func/RBAC/*Test.php"));
 		$suite->addTestFiles(glob("func/Surveys/*Test.php"));
diff --git a/tests/scripts/fusionforge-build-and-test-rpm.sh b/tests/scripts/fusionforge-build-and-test-rpm.sh
index aa55c4e..fce47ef 100755
--- a/tests/scripts/fusionforge-build-and-test-rpm.sh
+++ b/tests/scripts/fusionforge-build-and-test-rpm.sh
@@ -53,7 +53,7 @@ sleep 5
 if [ $VM = centos6 ] ; then
     ssh root@$HOST "yum -y --enablerepo=epel install cronolog"
 fi
-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-blocks"
+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"
 
 config_path=$(ssh root@$HOST forge_get_config config_path)
 

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

Summary of changes:
 src/fusionforge.spec                            |    4 ++--
 tests/RPMCentosTests.php                        |    2 +-
 tests/scripts/fusionforge-build-and-test-rpm.sh |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list