[Fusionforge-commits] r13807 - in trunk/src: . www/plugins

Christian Bayle cbayle at fusionforge.org
Sun Jul 17 23:13:11 CEST 2011


Author: cbayle
Date: 2011-07-17 23:13:11 +0200 (Sun, 17 Jul 2011)
New Revision: 13807

Removed:
   trunk/src/www/plugins/cvstracker
   trunk/src/www/plugins/fckeditor
   trunk/src/www/plugins/mediawiki
   trunk/src/www/plugins/online_help
   trunk/src/www/plugins/projects_hierarchy
   trunk/src/www/plugins/quota_management
   trunk/src/www/plugins/svntracker
Modified:
   trunk/src/fusionforge.spec
Log:
Move symlink creation in spec file


Modified: trunk/src/fusionforge.spec
===================================================================
--- trunk/src/fusionforge.spec	2011-07-17 20:59:04 UTC (rev 13806)
+++ trunk/src/fusionforge.spec	2011-07-17 21:13:11 UTC (rev 13807)
@@ -17,7 +17,7 @@
 %define httpduser       apache
 %define httpdgroup      apache
 
-%define fforge_admin    admin
+%define fforge_admin    fforgeadmin
 
 %define FORGE_DIR       %{_datadir}/gforge
 %define FORGE_CONF_DIR  %{_sysconfdir}/gforge
@@ -400,6 +400,8 @@
 %{__install} -m 755 -d $RPM_BUILD_ROOT/bin
 %{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_DIR}
 %{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_DIR}/lib
+%{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_DIR}/www
+%{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_DIR}/www/plugins
 %{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_CONF_DIR}
 %{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/httpd.d
 %{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/httpd.conf.d
@@ -438,24 +440,6 @@
 # install restricted shell for cvs accounts
 %{__cp} -a plugins/scmcvs/bin/cvssh.pl $RPM_BUILD_ROOT/bin/
 
-# Fix configuration files entries (various sys_* variables)
-#%{__cp} -a etc/local.inc.example $RPM_BUILD_ROOT/%{FORGE_CONF_DIR}/local.inc
-#%{__sed} -i -e "s!/path/to/gforge!%{FORGE_DIR}!g" $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/local.inc
-#%{__sed} -i -e "s!/path/to/jpgraph!/var/www/jpgraph-1.19!g" $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/local.inc
-#%{__sed} -i -e "s/\$sys_dbname=.*/\$sys_dbname='%{dbname}';/g" $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/local.inc
-#%{__sed} -i -e "s/\$sys_dbuser=.*/\$sys_dbuser='%{dbuser}';/g" $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/local.inc
-#%{__sed} -i -e "s/\$sys_apache_user=.*/\$sys_apache_user='%{httpduser}';/g" $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/local.inc
-#%{__sed} -i -e "s/\$sys_apache_group=.*/\$sys_apache_group='%{httpdgroup}';/g" $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/local.inc
-#%{__sed} -i -e "s|\$sys_plugins_path=.*|\$sys_plugins_path=\"%{FORGE_DIR}/plugins\";|g" $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/local.inc
-#%{__sed} -i -e "s|\$sys_upload_dir=.*|\$sys_upload_dir=\"\$sys_var_path/upload\";|g" $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/local.inc
-#%{__sed} -i -e "s|\$sys_urlroot=.*|\$sys_urlroot=\"%{FORGE_DIR}/www\";|g" $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/local.inc
-
-# Replace sys_localinc, sys_gfdbname, sys_gfdbuser
-#%{__cp} -a etc/httpd.secrets.example $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/httpd.secrets
-#%{__sed} -i -e "s|sys_localinc.*$|sys_localinc %{FORGE_CONF_DIR}/local.inc|g" $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/httpd.secrets
-#%{__sed} -i -e "s|sys_gfdbname.*$|sys_gfdbname %{dbname}|g" $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/httpd.secrets
-#%{__sed} -i -e "s|sys_gfdbuser.*$|sys_gfdbname %{dbuser}|g" $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/httpd.secrets
-
 # Apache configuration file
 %{__cp} -a etc/httpd.conf.d-fhs/* $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/httpd.conf.d/
 %{__cp} -a etc/config.ini.d/defaults.ini $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/config.ini.d/
@@ -520,6 +504,7 @@
 # plugin: cvssyncmail
 
 # plugin: cvstracker
+%{__ln_s} ../../plugins/cvstracker/www $RPM_BUILD_ROOT%{FORGE_DIR}/www/plugins/cvstracker
 # delete stuff that is clearly outdated/obsolete so we don't package this and confuse others
 %{__rm} -f $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/cvstracker/httpd.conf
 %{__rm} -f $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/cvstracker/Makefile
@@ -528,6 +513,7 @@
 # plugin: externalsearch
 
 # plugin: fckeditor
+%{__ln_s} ../../plugins/fckeditor/www $RPM_BUILD_ROOT%{FORGE_DIR}/www/plugins/fckeditor
 
 # plugin: forumml
 %{__ln_s} ../../plugins/forumml/www $RPM_BUILD_ROOT%{FORGE_DIR}/www/plugins/forumml
@@ -536,6 +522,7 @@
 %{__ln_s} ../../plugins/hudson/www $RPM_BUILD_ROOT%{FORGE_DIR}/www/plugins/hudson
 
 # plugin: mediawiki
+%{__ln_s} ../../plugins/mediawiki/www $RPM_BUILD_ROOT%{FORGE_DIR}/www/plugins/mediawiki
 # create symlink for apache configuration for mediawiki plugin
 ## first, delete the php_admin_value include_path
 %{__sed} -i -e "/^.*php_admin_value[[:space:]]*include_path.*/d" $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/etc/httpd.d/61plugin-mediawiki
@@ -559,10 +546,13 @@
 %{__ln_s} ../../plugins/message/www $RPM_BUILD_ROOT%{FORGE_DIR}/www/plugins/message
 
 # plugin: online_help
+%{__ln_s} ../../plugins/online_help/www $RPM_BUILD_ROOT%{FORGE_DIR}/www/plugins/online_help
 
 # plugin: projects_hierarchy
+%{__ln_s} ../../plugins/projects_hierarchy/www $RPM_BUILD_ROOT%{FORGE_DIR}/www/plugins/projects_hierarchy
 
 # plugin: quota_management
+%{__ln_s} ../../plugins/quota_management/www $RPM_BUILD_ROOT%{FORGE_DIR}/www/plugins/quota_management
 
 # plugin: scmarch
 
@@ -592,6 +582,7 @@
 # plugin: svncommitemail
 
 # plugin: svntracker
+%{__ln_s} ../../plugins/svntracker/www $RPM_BUILD_ROOT%{FORGE_DIR}/www/plugins/svntracker
 # install crontab
 %{__install} -m 644 plugins/svntracker/rpm-specific/cron.d/gforge-plugin-svntracker $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
 

Deleted: trunk/src/www/plugins/cvstracker
===================================================================
--- trunk/src/www/plugins/cvstracker	2011-07-17 20:59:04 UTC (rev 13806)
+++ trunk/src/www/plugins/cvstracker	2011-07-17 21:13:11 UTC (rev 13807)
@@ -1 +0,0 @@
-link ../../plugins/cvstracker/www
\ No newline at end of file

Deleted: trunk/src/www/plugins/fckeditor
===================================================================
--- trunk/src/www/plugins/fckeditor	2011-07-17 20:59:04 UTC (rev 13806)
+++ trunk/src/www/plugins/fckeditor	2011-07-17 21:13:11 UTC (rev 13807)
@@ -1 +0,0 @@
-link ../../plugins/fckeditor/www
\ No newline at end of file

Deleted: trunk/src/www/plugins/mediawiki
===================================================================
--- trunk/src/www/plugins/mediawiki	2011-07-17 20:59:04 UTC (rev 13806)
+++ trunk/src/www/plugins/mediawiki	2011-07-17 21:13:11 UTC (rev 13807)
@@ -1 +0,0 @@
-link ../../plugins/mediawiki/www
\ No newline at end of file

Deleted: trunk/src/www/plugins/online_help
===================================================================
--- trunk/src/www/plugins/online_help	2011-07-17 20:59:04 UTC (rev 13806)
+++ trunk/src/www/plugins/online_help	2011-07-17 21:13:11 UTC (rev 13807)
@@ -1 +0,0 @@
-link ../../plugins/online_help/www
\ No newline at end of file

Deleted: trunk/src/www/plugins/projects_hierarchy
===================================================================
--- trunk/src/www/plugins/projects_hierarchy	2011-07-17 20:59:04 UTC (rev 13806)
+++ trunk/src/www/plugins/projects_hierarchy	2011-07-17 21:13:11 UTC (rev 13807)
@@ -1 +0,0 @@
-link ../../plugins/projects_hierarchy/www
\ No newline at end of file

Deleted: trunk/src/www/plugins/quota_management
===================================================================
--- trunk/src/www/plugins/quota_management	2011-07-17 20:59:04 UTC (rev 13806)
+++ trunk/src/www/plugins/quota_management	2011-07-17 21:13:11 UTC (rev 13807)
@@ -1 +0,0 @@
-link ../../plugins/quota_management/www
\ No newline at end of file

Deleted: trunk/src/www/plugins/svntracker
===================================================================
--- trunk/src/www/plugins/svntracker	2011-07-17 20:59:04 UTC (rev 13806)
+++ trunk/src/www/plugins/svntracker	2011-07-17 21:13:11 UTC (rev 13807)
@@ -1 +0,0 @@
-link ../../plugins/svntracker/www
\ No newline at end of file




More information about the Fusionforge-commits mailing list