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

[Roland Mas]

Author: lolando
Date: 2009-04-06 17:19:31 +0200 (Mon, 06 Apr 2009)
New Revision: 7347

Modified:
   trunk/
   trunk/Makefile.rh
   trunk/gforge/fusionforge.spec
Log:
Merged from 4.8: Generate *.mo at rpm build time rather than on install


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300
/branches/Branch_4_8:7334-7335

   + /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300
/branches/Branch_4_8:7334-7335,7344

Modified: svk:merge
   - 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335

   + 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344


Modified: trunk/Makefile.rh
===================================================================
--- trunk/Makefile.rh	2009-04-06 15:08:03 UTC (rev 7346)
+++ trunk/Makefile.rh	2009-04-06 15:19:31 UTC (rev 7347)
@@ -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: trunk/gforge/fusionforge.spec
===================================================================
--- trunk/gforge/fusionforge.spec	2009-04-06 15:08:03 UTC (rev 7346)
+++ trunk/gforge/fusionforge.spec	2009-04-06 15:19:31 UTC (rev 7347)
@@ -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