[Fusionforge-commits] r7344 - in branches/Branch_4_8: . gforge

Alexandre Neymann neymanna at libremir.placard.fr.eu.org
Mon Apr 6 14:28:49 CEST 2009


Author: neymanna
Date: 2009-04-06 14:28:49 +0200 (Mon, 06 Apr 2009)
New Revision: 7344

Modified:
   branches/Branch_4_8/Makefile.rh
   branches/Branch_4_8/gforge/fusionforge.spec
Log:
*.mo are build with rpm using utils/manage-translations.sh build

Modified: branches/Branch_4_8/Makefile.rh
===================================================================
--- branches/Branch_4_8/Makefile.rh	2009-04-03 21:16:59 UTC (rev 7343)
+++ branches/Branch_4_8/Makefile.rh	2009-04-06 12:28:49 UTC (rev 7344)
@@ -81,6 +81,7 @@
 build: rpmprep		# Build rpm fusionforge packages                               #
 	cd gforge; find . -type f | grep -v '/CVS/' | grep -v '/.svn/' | grep -v contrib | grep -v debian | grep -v docs/phpdoc/docs | cpio -pdumvB $(RPM_TMP)/SOURCES/fusionforge-$(version)
 	cd $(RPM_TMP)/SOURCES/fusionforge-$(version); mv plugins ../;mkdir ../utils;mv utils/install-nsspgsql.sh ../utils/;mv utils/fusionforge-shell-postgresql.spec ../utils/
+	cd $(RPM_TMP)/SOURCES/fusionforge-$(version)/;  utils/manage-translations.sh build
 	cd $(RPM_TMP)/SOURCES/; cp fusionforge-$(version)/rpm-specific/patches/gforge-4.0-deb_rpm.patch .
 	cd $(RPM_TMP)/SOURCES/; tar cvjf fusionforge-$(version).tar.bz2 fusionforge-$(version)
 	cd $(RPM_TMP)/SOURCES/; rpmbuild -ts --nodeps fusionforge-$(version).tar.bz2

Modified: branches/Branch_4_8/gforge/fusionforge.spec
===================================================================
--- branches/Branch_4_8/gforge/fusionforge.spec	2009-04-03 21:16:59 UTC (rev 7343)
+++ branches/Branch_4_8/gforge/fusionforge.spec	2009-04-06 12:28:49 UTC (rev 7344)
@@ -125,7 +125,7 @@
 
 %define GFORGE_DIR		%{_datadir}/gforge
 %define GFORGE_CONF_DIR		%{_sysconfdir}/gforge
-%define GFORGE_LANG_DIR         %{GFORGE_DIR}/translations
+%define GFORGE_LANG_DIR         %{_datadir}/locale
 %define GFORGE_LIB_DIR		%{GFORGE_DIR}/lib
 %define GFORGE_DB_DIR		%{GFORGE_DIR}/db
 %define GFORGE_BIN_DIR		%{GFORGE_DIR}/bin
@@ -191,25 +191,15 @@
 # configuring GForge
 install -m 600 rpm-specific/conf/gforge.conf $RPM_BUILD_ROOT/%{GFORGE_CONF_DIR}/
 install -m 750 rpm-specific/scripts/gforge-config $RPM_BUILD_ROOT/%{SBIN_DIR}/
-if ls translations/*.po &> /dev/null; then
-        cp translations/*.po $RPM_BUILD_ROOT/%{GFORGE_LANG_DIR}/
-fi
-#cp -rp rpm-specific/custom $RPM_BUILD_ROOT/%{GFORGE_CONF_DIR}
 
+#install *.mo
+cp -rp locales/* $RPM_BUILD_ROOT/%{GFORGE_LANG_DIR}/
+
 # setting crontab
 install -m 664 cron.d/fusionforge $RPM_BUILD_ROOT/%{CROND_DIR}/
 
 %pre
 %startpostgresql
-#tcpip_socket is no more use with postgres 8.x
-#if su -l postgres -s /bin/sh -c 'psql template1 -c "SHOW tcpip_socket;"' | grep " off" &> /dev/null; then
-#	echo "###"
-#	echo "# You should set tcpip_socket = true in your /var/lib/pgsql/data/postgresql.conf"
-#	echo "# before installing GForge and restart PostgreSQL."
-#	echo "# Then you should be able to install GForge RPM."
-#	echo "###"
-#	exit 1
-#fi
 if ! id -u %gfuser >/dev/null 2>&1; then
 	groupadd -r %{gfgroup}
 	useradd -r -g %{gfgroup} -d %{GFORGE_DIR} -s /bin/bash -c "GForge User" %{gfuser}
@@ -304,9 +294,6 @@
 	su -l postgres -c "psql -c 'UPDATE groups SET register_time=EXTRACT(EPOCH FROM NOW());' %{dbname} >/dev/null 2>&1"
 	%changepassword $SITEADMIN_PASSWORD
 	
-	# creation *.mo files for gettext
-        for l in eu bg ca zh_TW nl en eo fr de el he id it ja ko la nb pl pt_BR pt ru zh_CN es sv th ; do mkdir -p /usr/share/locale/$l/LC_MESSAGES && msgfmt -o /usr/share/locale/$l/LC_MESSAGES/gforge.mo %{GFORGE_LANG_DIR}/$l.po ; done
-
 	%gracefulhttpd
 	
 	if ! id -u anonymous >/dev/null 2>&1; then
@@ -332,8 +319,6 @@
 	# updating configuration
 	%{SBIN_DIR}/gforge-config || :
 	
-	# creation *.mo files for gettext
-        for l in eu bg ca zh_TW nl en eo fr de el he id it ja ko la nb pl pt_BR pt ru zh_CN es sv th ; do mkdir -p /usr/share/locale/$l/LC_MESSAGES && msgfmt -o /usr/share/locale/$l/LC_MESSAGES/gforge.mo %{GFORGE_LANG_DIR}/$l.po ; done
 fi
 
 %preun




More information about the Fusionforge-commits mailing list