[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 6d123901f7e7ff041c4d0491c1c6215f65e44214

Roland Mas lolando at fusionforge.org
Tue Aug 5 10:30:23 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  6d123901f7e7ff041c4d0491c1c6215f65e44214 (commit)
      from  a2bb5599c108d7eadeabfafb7a66a47720c6a33e (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 6d123901f7e7ff041c4d0491c1c6215f65e44214
Author: Roland Mas <lolando at debian.org>
Date:   Tue Aug 5 10:30:15 2014 +0200

    Updates to RPM and related testsuite

diff --git a/src/fusionforge.spec b/src/fusionforge.spec
index f37c7ec..570f77c 100644
--- a/src/fusionforge.spec
+++ b/src/fusionforge.spec
@@ -24,6 +24,7 @@
 %define FORGE_DIR       %{_datadir}/gforge
 %define FORGE_CONF_DIR  %{_sysconfdir}/gforge
 %define FORGE_LANG_DIR  %{_datadir}/locale
+%define FORGE_BINARY_PATH       %{_datadir}/gforge/bin
 %define FORGE_DATA_PATH %{_var}/lib/gforge
 %define FORGE_CHROOT_PATH %{FORGE_DATA_PATH}/chroot
 %define FORGE_PLUGINS_LIB_DIR       %{FORGE_DIR}/plugins
@@ -33,6 +34,7 @@
 # %define FORGE_DIR       %(src/utils/forge_get_config_basic fhsrh source_path)
 # %define FORGE_CONF_DIR  %(src/utils/forge_get_config_basic fhsrh config_path)
 # %define FORGE_LANG_DIR  %{_datadir}/locale
+# %define FORGE_BINARY_PATH       %(src/utils/forge_get_config_basic fhsrh binary_path)
 # %define FORGE_DATA_PATH   %(src/utils/forge_get_config_basic fhsrh data_path)
 # %define FORGE_CHROOT_PATH   %(src/utils/forge_get_config_basic fhsrh chroot)
 # %define FORGE_PLUGINS_LIB_DIR         %(src/utils/forge_get_config_basic fhsrh plugins_path)
@@ -485,6 +487,12 @@ search_and_replace "/opt/gforge" "%{FORGE_DIR}"
 # Installing gforge
 %{__cp} -a * $RPM_BUILD_ROOT/%{FORGE_DIR}/
 
+# Install utils
+%{__ln_s} %{FORGE_DIR}/utils %{FORGE_BINARY_PATH}
+%{__ln_s} %{FORGE_BINARY_PATH}/forge_wrapper usr/bin/forge_get_config
+%{__ln_s} %{FORGE_BINARY_PATH}/forge_wrapper usr/bin/forge_run_job
+%{__ln_s} %{FORGE_BINARY_PATH}/forge_wrapper usr/bin/forge_run_plugin_job
+
 # Create project vhost space symlink
 %{__ln_s} /home/groups $RPM_BUILD_ROOT/%{FORGE_DATA_PATH}/homedirs/groups
 # install restricted shell for cvs accounts
diff --git a/tests/scripts/fusionforge-build-and-test-rpm.sh b/tests/scripts/fusionforge-build-and-test-rpm.sh
index 05fea93..fce47ef 100755
--- a/tests/scripts/fusionforge-build-and-test-rpm.sh
+++ b/tests/scripts/fusionforge-build-and-test-rpm.sh
@@ -55,7 +55,7 @@ if [ $VM = centos6 ] ; then
 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-scmgit fusionforge-plugin-blocks"
 
-config_path=$(ssh root@$HOST $FORGE_HOME/utils/forge_get_config config_path)
+config_path=$(ssh root@$HOST forge_get_config config_path)
 
 ssh root@$HOST '(echo [core];echo use_ssl=no) > $config_path/config.ini.d/zzz-buildbot.ini'
 ssh root@$HOST "(echo [moinmoin];echo use_frame=no) >> $config_path/config.ini.d/zzz-buildbot.ini"

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

Summary of changes:
 src/fusionforge.spec                            |    8 ++++++++
 tests/scripts/fusionforge-build-and-test-rpm.sh |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list