[Fusionforge-commits] r6977 - in trunk/gforge: . plugins/scmcvs utils

Alexandre Neymann neymanna at libremir.placard.fr.eu.org
Mon Feb 16 11:26:28 CET 2009


Author: neymanna
Date: 2009-02-16 11:26:27 +0100 (Mon, 16 Feb 2009)
New Revision: 6977

Modified:
   trunk/gforge/gforge.spec
   trunk/gforge/plugins/scmcvs/gforge-plugin-scmcvs.spec
   trunk/gforge/utils/fusionforge-shell-postgresql.spec
Log:
fix gforge.spec fusionforge-plugin-scmcvs.spec fusionforge-shell-posqgresql.spec

Modified: trunk/gforge/gforge.spec
===================================================================
--- trunk/gforge/gforge.spec	2009-02-16 09:32:28 UTC (rev 6976)
+++ trunk/gforge/gforge.spec	2009-02-16 10:26:27 UTC (rev 6977)
@@ -40,9 +40,9 @@
 Requires: php-jpgraph php-gd
 #update sys_path_to_jpgraph in gforge.conf if you remove this line
 #Requires: /var/www/jpgraph/jpgraph.php
-Requires: libnss-pgsql >= 1.4
+#Requires: libnss-pgsql >= 1.4
 Requires: mailman
-Requires: nscd
+#Requires: nscd
 Requires: gettext
  
 BuildRequires: perl
@@ -305,9 +305,9 @@
  
  	# [ ! -f /usr/bin/php4 ] && ln -s /usr/bin/php /usr/bin/php4
  	
- 	chroot=`grep '^gforge_chroot:' /etc/gforge/gforge.conf | sed 's/.*:\s*\(.*\)/\1/'`
- 	if [ ! -d /var/lib/gforge/chroot/ ] ; then
-		mkdir -p /var/lib/gforge/chroot/
+ 	CHROOT=`grep '^gforge_chroot=' %{GFORGE_CONF_DIR}/gforge.conf | sed 's/.*=\s*\(.*\)/\1/'`
+ 	if [ ! -d $CHROOT ] ; then
+		mkdir -p $CHROOT
 	fi
 	
 	ln -s %{GFORGE_DIR}/www/env.inc.php %{PLUGINS_LIB_DIR}/env.inc.php

Modified: trunk/gforge/plugins/scmcvs/gforge-plugin-scmcvs.spec
===================================================================
--- trunk/gforge/plugins/scmcvs/gforge-plugin-scmcvs.spec	2009-02-16 09:32:28 UTC (rev 6976)
+++ trunk/gforge/plugins/scmcvs/gforge-plugin-scmcvs.spec	2009-02-16 10:26:27 UTC (rev 6977)
@@ -125,11 +125,11 @@
 	# 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/
+	CHROOT=`grep '^gforge_chroot=' %{GFORGE_CONF_DIR}/gforge.conf | sed 's/.*=\s*\(.*\)/\1/'`
+	if [ ! -d $CHROOT/cvsroot ] ; then
+		mkdir -p $CHROOT/cvsroot
 	fi
-	ln -s /var/lib/gforge/chroot/cvsroot /cvsroot
+	ln -s $CHROOT/cvsroot /cvsroot
 else
         # upgrade
         :

Modified: trunk/gforge/utils/fusionforge-shell-postgresql.spec
===================================================================
--- trunk/gforge/utils/fusionforge-shell-postgresql.spec	2009-02-16 09:32:28 UTC (rev 6976)
+++ trunk/gforge/utils/fusionforge-shell-postgresql.spec	2009-02-16 10:26:27 UTC (rev 6977)
@@ -28,7 +28,8 @@
 
 #Globals defines for gforge
 %define GFORGE_DIR              %{_datadir}/gforge
-%define SBIN_DIR				%{_sbindir}
+%define SBIN_DIR		%{_sbindir}
+%define CROND_DIR               %{_sysconfdir}/cron.d
 
 %description
 GForge provides many tools to aid collaboration in a
@@ -74,6 +75,15 @@
 	#Configuration de libnss-pgsql
 	ln -s %{GFORGE_DIR}/utils/install-nsspgsql.sh %{SBIN_DIR}/
 	install-nsspgsql.sh setup
+
+	#if plugin scmcvs is installed, comment the cron usergroup.php
+	if [ ! "$(rpm -qa fusionforge-plugin-scmcvs)" = "" ]; then
+		#echo "plugin scmcvs installed"
+		if [ "$(grep 'usergroup.php' %{CROND_DIR}/fusionforge-plugin-scmcvs | grep '#')" = "" ]; then
+			#echo "I comment the cron if it is un comment"
+			sed -i "s/^\(.*usergroup.php.*\)/#\1/" %{CROND_DIR}/fusionforge-plugin-scmcvs
+		fi
+	fi
 else
         # upgrade
         :




More information about the Fusionforge-commits mailing list