[Fusionforge-commits] r12380 - trunk/src

Christian Bayle cbayle at fusionforge.org
Fri Feb 25 19:44:44 CET 2011


Author: cbayle
Date: 2011-02-25 19:44:44 +0100 (Fri, 25 Feb 2011)
New Revision: 12380

Modified:
   trunk/src/fusionforge.spec
Log:
Add missing config files


Modified: trunk/src/fusionforge.spec
===================================================================
--- trunk/src/fusionforge.spec	2011-02-25 18:44:24 UTC (rev 12379)
+++ trunk/src/fusionforge.spec	2011-02-25 18:44:44 UTC (rev 12380)
@@ -404,7 +404,8 @@
 
 # Apache configuration file
 %{__cp} -a etc/httpd.conf.d-fhs/* $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/httpd.conf.d/
-%{__cp} -a etc/config.ini-fhs $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/
+%{__cp} -a etc/config.ini.d-fhs/* $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/config.ini.d/
+%{__cp} -a etc/config.ini-fhs $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/config.ini
 %{__cp} -a etc/httpd.conf-fhs $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/gforge.conf
 #%{__cp} -a etc/gforge-httpd.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/gforge.conf
 #%{__sed} -i -e 's|.*php_value[[:space:]]*include_path.*$|\tphp_value\tinclude_path ".:/usr/share/gforge/www/include:/usr/share/gforge:/etc/gforge:/usr/share/gforge/common:/usr/share/gforge/www:/usr/share/gforge/plugins"|' $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/gforge.conf
@@ -776,8 +777,9 @@
 %dir %{FORGE_CONF_DIR}/httpd.d
 %dir %{FORGE_CONF_DIR}/httpd.conf.d
 %{FORGE_CONF_DIR}/httpd.conf.d/*
-%{FORGE_CONF_DIR}/config.ini-fhs
 %{_sysconfdir}/httpd/conf.d/gforge.conf
+%{FORGE_CONF_DIR}/config.ini.d/*
+%{FORGE_CONF_DIR}/config.ini
 %dir %attr(0775,root,%{httpdgroup}) %{FORGE_CONF_DIR}/plugins
 %dir %{FORGE_VAR_LIB}/scmtarballs
 %dir %{FORGE_VAR_LIB}/scmsnapshots




More information about the Fusionforge-commits mailing list