[evolvis-commits] r12851: fix plugins links in .spec

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 02:03:27 CET 2011


Author: mirabilos
Date: 2011-02-28 02:03:27 +0100 (Mon, 28 Feb 2011)
New Revision: 12851

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/gforge.spec
   trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/gforge-plugin-scmcvs.spec
Log:
fix plugins links in .spec

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/gforge.spec
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/gforge.spec	2011-02-28 01:03:25 UTC (rev 12850)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/gforge.spec	2011-02-28 01:03:27 UTC (rev 12851)
@@ -165,6 +165,10 @@
 for i in common cronjobs etc rpm-specific utils www ; do
 	cp -rp $i $RPM_BUILD_ROOT/%{GFORGE_DIR}/
 done
+
+#create a repository to link the plugins web pages
+install -m 755 -d $RPM_BUILD_ROOT/%{GFORGE_DIR}/www/plugins
+
 install -m 750 setup $RPM_BUILD_ROOT/%{GFORGE_DIR}/
 chmod 755 $RPM_BUILD_ROOT/%{GFORGE_DIR}/utils/fill-in-the-blanks.pl
 chmod 755 $RPM_BUILD_ROOT/%{GFORGE_DIR}/utils/install-nsspgsql.sh
@@ -311,6 +315,9 @@
 	
 	ln -s %{GFORGE_DIR}/www/env.inc.php %{PLUGINS_LIB_DIR}/env.inc.php
 	
+	#if not the env.inc.php include-path isn't correct
+        ln -s %{PLUGINS_LIB_DIR} %{GFORGE_DIR}/plugins
+	
 	#Configuration de libnss-pgsql
 	ln -s %{GFORGE_DIR}/utils/install-nsspgsql.sh /usr/sbin
 	install-nsspgsql.sh setup

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/gforge-plugin-scmcvs.spec
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/gforge-plugin-scmcvs.spec	2011-02-28 01:03:25 UTC (rev 12850)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/gforge-plugin-scmcvs.spec	2011-02-28 01:03:27 UTC (rev 12851)
@@ -106,11 +106,11 @@
 
 %post
 if [ "$1" = "1" ] ; then
-		#if not the env.inc.php include-path isn't correct
-		ln -s /usr/lib/gforge/plugins/ /usr/share/gforge/plugins
-		
-		[ ! -f /bin/cvssh ] && ln -s %{PLUGIN_LIB}/bin/cvssh.pl /bin/cvssh
+	# link the plugin www rep to be accessed by web
+	ln -s %{PLUGIN_LIB}/www %{GFORGE_DIR}/www/plugins/%{name}
 
+	[ ! -f /bin/cvssh ] && ln -s %{PLUGIN_LIB}/bin/cvssh.pl /bin/cvssh
+
         #GF_DOMAIN=$(grep ^domain_name= %{GFORGE_CONF_DIR}/gforge.conf | cut -d= -f2-)
         #perl -pi -e "
         #        s#^\\\$sys_plugins_path=.*#\\\$sys_plugins_path='"%{PLUGINS_LIB_DIR}"';#;
@@ -122,14 +122,14 @@
         perl -pi -e "
 		s/sys_use_scm=false/sys_use_scm=true/g" %{GFORGE_CONF_DIR}/gforge.conf
 		
-		# initializing configuration
-		%{SBIN_DIR}/gforge-config
-		
-		chroot=`grep '^gforge_chroot:' /etc/gforge/gforge.conf | sed 's/.*:\s*\(.*\)/\1/'`
- 		if [ ! -d /var/lib/gforge/chroot/cvsroot/ ] ; then
-			mkdir -p /var/lib/gforge/chroot/cvsroot/
-		fi
-		ln -s /var/lib/gforge/chroot/cvsroot /cvsroot
+	# initializing configuration
+	%{SBIN_DIR}/gforge-config
+	
+	chroot=`grep '^gforge_chroot:' /etc/gforge/gforge.conf | sed 's/.*:\s*\(.*\)/\1/'`
+	if [ ! -d /var/lib/gforge/chroot/cvsroot/ ] ; then
+		mkdir -p /var/lib/gforge/chroot/cvsroot/
+	fi
+	ln -s /var/lib/gforge/chroot/cvsroot /cvsroot
 else
         # upgrade
         :



More information about the evolvis-commits mailing list