[Fusionforge-commits] r10102 - trunk/src

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Fri Jun 18 23:50:19 CEST 2010


Author: aljeux
Date: 2010-06-18 23:50:18 +0200 (Fri, 18 Jun 2010)
New Revision: 10102

Modified:
   trunk/src/fusionforge.spec
Log:
[#170] Merged some improvements from Bond .spec file

Modified: trunk/src/fusionforge.spec
===================================================================
--- trunk/src/fusionforge.spec	2010-06-18 17:44:06 UTC (rev 10101)
+++ trunk/src/fusionforge.spec	2010-06-18 21:50:18 UTC (rev 10102)
@@ -229,14 +229,14 @@
 %package svncommitemail
 Summary: subversion commit email plugin for FusionForge
 Group: Development/Tools
-Requires: %{name} >= %{version}, php, subversion, perl
+Requires: %{name} >= %{version}, php, subversion, perl, %{name}-scmsvn >= %{version}
 %description svncommitemail
 This RPM installs subversion commit email notification plugin for FusionForge.
 
 %package svntracker
 Summary: SVNTracker plugin for FusionForge
 Group: Development/Tools
-Requires: %{name} >= %{version}, php, subversion, perl, postgresql
+Requires: %{name} >= %{version}, php, subversion, perl, postgresql, %{name}-scmsvn >= %{version}
 %description svntracker
 SVNTracker plugin allows linking SVN log messages to Trackers and tasks.
 It will review all commits in a project and search for a specific string
@@ -503,11 +503,13 @@
 # this won't hurt anything, just ensure we have a running database
 /sbin/service postgresql start >>/var/log/%{name}-install.log 2>&1
 
-# setup user/group for gforge
-if [ `/usr/bin/getent passwd | /bin/cut -d: -f1 | /bin/grep -c %{gfuser}` -eq 0 ] ; then
-    echo "Did not find existing fusionforge user. Adding fusionforge group and user..." >>/var/log/%{name}-install.log 2>&1
-    /usr/sbin/groupadd -r %{gfgroup}
-    /usr/sbin/useradd -r -g %{gfgroup} -d %{GFORGE_DIR} -s /bin/bash -c "FusionForge User" %{gfuser}
+if [ "$1" -eq "1" ]; then
+	# setup user/group for gforge
+	if [ `/usr/bin/getent passwd | /bin/cut -d: -f1 | /bin/grep -c %{gfuser}` -eq 0 ] ; then
+		echo "Did not find existing fusionforge user. Adding fusionforge group and user..." >>/var/log/%{name}-install.log 2>&1
+		/usr/sbin/groupadd -r %{gfgroup}
+		/usr/sbin/useradd -r -g %{gfgroup} -d %{GFORGE_DIR} -s /bin/bash -c "FusionForge User" %{gfuser}
+	fi
 fi
 
 %post




More information about the Fusionforge-commits mailing list