[Fusionforge-commits] FusionForge branch Branch_5_3 updated. a7c0ff1518dcc572b4d775246d09327c559478f8

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

    Updates to RPM

diff --git a/src/fusionforge.spec b/src/fusionforge.spec
index 570f77c..53c27aa 100644
--- a/src/fusionforge.spec
+++ b/src/fusionforge.spec
@@ -449,7 +449,9 @@ sysauthldap plugin for FusionForge.
 %{__install} -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
 %{__install} -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
 %{__install} -m 755 -d $RPM_BUILD_ROOT/bin
+%{__install} -m 755 -d $RPM_BUILD_ROOT/usr/bin
 %{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_DIR}
+%{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_BINARY_PATH}
 %{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_DIR}/vendor
 %{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_DIR}/www
 %{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_DIR}/www/plugins
@@ -488,10 +490,10 @@ search_and_replace "/opt/gforge" "%{FORGE_DIR}"
 %{__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
+%{__ln_s} %{FORGE_DIR}/utils ${RPM_BUILD_ROOT}%{FORGE_BINARY_PATH}
+%{__ln_s} %{FORGE_BINARY_PATH}/forge_wrapper ${RPM_BUILD_ROOT}/usr/bin/forge_get_config
+%{__ln_s} %{FORGE_BINARY_PATH}/forge_wrapper ${RPM_BUILD_ROOT}/usr/bin/forge_run_job
+%{__ln_s} %{FORGE_BINARY_PATH}/forge_wrapper ${RPM_BUILD_ROOT}/usr/bin/forge_run_plugin_job
 
 # Create project vhost space symlink
 %{__ln_s} /home/groups $RPM_BUILD_ROOT/%{FORGE_DATA_PATH}/homedirs/groups
@@ -832,6 +834,7 @@ fi
 %{FORGE_DIR}/install-ng
 %{FORGE_PLUGINS_LIB_DIR}/README
 # Directories under %{FORGE_DIR}
+%{FORGE_BINARY_PATH}
 %{FORGE_DIR}/backend
 %{FORGE_DIR}/common
 #%{FORGE_DIR}/contrib
@@ -915,6 +918,9 @@ fi
 %dir %{_var}/log/gforge
 /home/groups
 /bin/cvssh.pl
+/usr/bin/forge_get_config
+/usr/bin/forge_run_job
+/usr/bin/forge_run_plugin_job
 %config(noreplace) %{FORGE_CONF_DIR}/config.ini.d/authbuiltin.ini
 %{FORGE_PLUGINS_LIB_DIR}/authbuiltin
 

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

Summary of changes:
 src/fusionforge.spec |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list