[Fusionforge-commits] r9261 - in trunk: . gforge

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Sun Mar 28 22:25:40 CEST 2010


Author: aljeux
Date: 2010-03-28 22:25:40 +0200 (Sun, 28 Mar 2010)
New Revision: 9261

Modified:
   trunk/Makefile
   trunk/gforge/fusionforge-install-1-deps.php
   trunk/gforge/fusionforge-install-2.php
Log:
Use jpgraph from DAG RPM and drop the allinone package

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2010-03-28 19:36:05 UTC (rev 9260)
+++ trunk/Makefile	2010-03-28 20:25:40 UTC (rev 9261)
@@ -40,10 +40,6 @@
 	cd gforge; find . -type f -or -type l | grep -v '/.svn/' | grep -v '^./debian' | grep -v '^./deb-specific' | grep -v '^./rpm-specific' | grep -v '^./contrib' | grep -v '^./gforge.spec' | grep -v '^./README.setup' | grep -v '^./setup' | cpio -pdumB --quiet /tmp/$(VERSION)
 	cd /tmp/$(VERSION); utils/manage-translations.sh build
 	cd /tmp/; tar jcf $(BUILDRESULT)/$(VERSION).tar.bz2 $(VERSION)
-	cd /tmp/$(VERSION); tar zxf $(ARCHIVE)/libphp-jpgraph_1.5.2.orig.tar.gz
-	cd /tmp/$(VERSION); patch -p0 < $(ARCHIVE)/jpgraph-1.5.2-php5_and_liberation_fonts.patch
-	cd /tmp/$(VERSION); mkdir jpgraph; mv jpgraph-1.5.2/src/* jpgraph; rm -fr jpgraph-1.5.2
-	cd /tmp; tar jcf $(BUILDRESULT)/$(VERSION)-allinone.tar.bz2 $(VERSION)
 	rm -fr /tmp/$(VERSION)
 
 build-unit-tests:

Modified: trunk/gforge/fusionforge-install-1-deps.php
===================================================================
--- trunk/gforge/fusionforge-install-1-deps.php	2010-03-28 19:36:05 UTC (rev 9260)
+++ trunk/gforge/fusionforge-install-1-deps.php	2010-03-28 20:25:40 UTC (rev 9261)
@@ -48,7 +48,7 @@
 	addFusionForgeYumRepo();
 	addDagRPMForgeYumRepo();
 	INFO("Installing packages: Executing YUM. Please wait...\n\n\n");
-	passthru("yum -y install httpd php mailman cvs postgresql postgresql-libs postgresql-server postgresql-contrib perl-URI php-pgsql subversion mod_dav_svn postfix rcs php-gd mod_ssl wget openssh which liberation-fonts htmlpurifier php-mbstring poppler-utils php-pecl-zip antiword");
+	passthru("yum -y install httpd php mailman cvs postgresql postgresql-libs postgresql-server postgresql-contrib perl-URI php-pgsql subversion mod_dav_svn postfix rcs php-gd mod_ssl wget openssh which htmlpurifier php-mbstring php-jpgraph poppler-utils php-pecl-zip antiword");
 }
 
 function installRHEL4() {

Modified: trunk/gforge/fusionforge-install-2.php
===================================================================
--- trunk/gforge/fusionforge-install-2.php	2010-03-28 19:36:05 UTC (rev 9260)
+++ trunk/gforge/fusionforge-install-2.php	2010-03-28 20:25:40 UTC (rev 9261)
@@ -239,13 +239,14 @@
 	$hash = md5(microtime());
 	system("perl -spi -e \"s/sys_session_key = 'foobar'/sys_session_key = '$hash'/\" /etc/gforge/local.inc");
 
-	# Use liberation fonts if jpgraph provided in the archive.
-	if (is_dir("/opt/gforge/jpgraph")) {
-		system("perl -spi -e \"s!//(.gantt_title_font_family)='FF_ARIAL';!\\$1='FF_LIBERATION_SANS';!\" /etc/gforge/local.inc");
-		system("perl -spi -e \"s!//(.gantt_title_font_style=.*)!\\$1!\" /etc/gforge/local.inc");
-		system("perl -spi -e \"s!//(.gantt_title_font_size=.*)!\\$1!\" /etc/gforge/local.inc");
-		system("perl -spi -e \"s!//(.gantt_task_font_family)='FF_ARIAL';!\\$1='FF_LIBERATION_SANS';!\" /etc/gforge/local.inc");
-		system("perl -spi -e \"s!//(.gantt_task_font_style=.*)!\\$1!\" /etc/gforge/local.inc");
-		system("perl -spi -e \"s!//(.gantt_task_font_size=.*)!\\$1!\" /etc/gforge/local.inc");
+	# Set jpgraph path for Red Hat
+	if (is_dir("/var/www/jpgraph-1.19")) {
+		system("perl -spi -e \"s!^(.sys_path_to_jpgraph)=.*!\\$1='/var/www/jpgraph-1.19';!\" /etc/gforge/local.inc");
+		system("perl -spi -e \"s!^(.gantt_title_font_family=.*)!//\\$1!\" /etc/gforge/local.inc");
+		system("perl -spi -e \"s!^(.gantt_title_font_style=.*)!//\\$1!\" /etc/gforge/local.inc");
+		system("perl -spi -e \"s!^(.gantt_title_font_size=.*)!//\\$1!\" /etc/gforge/local.inc");
+		system("perl -spi -e \"s!^(.gantt_task_font_family=.*)!//\\$1!\" /etc/gforge/local.inc");
+		system("perl -spi -e \"s!^(.gantt_task_font_style=.*)!//\\$1!\" /etc/gforge/local.inc");
+		system("perl -spi -e \"s!^(.gantt_task_font_size=.*)!//\\$1!\" /etc/gforge/local.inc");
 	}
 	print "\n";




More information about the Fusionforge-commits mailing list