packages: nagios-vshell/nagios-vshell.spec, nagios-vshell/locale.patch (NEW...

[glen]

Author: glen                         Date: Sat Jan  7 18:29:00 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix localization

---- Files affected:
packages/nagios-vshell:
   nagios-vshell.spec (1.8 -> 1.9) , locale.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-vshell/nagios-vshell.spec
diff -u packages/nagios-vshell/nagios-vshell.spec:1.8 packages/nagios-vshell/nagios-vshell.spec:1.9
--- packages/nagios-vshell/nagios-vshell.spec:1.8	Sat Jan  7 18:59:32 2012
+++ packages/nagios-vshell/nagios-vshell.spec	Sat Jan  7 19:28:54 2012
@@ -1,21 +1,20 @@
 # $Revision$, $Date$
-# TODO
-# - gettext to system dir
 %define		pkg	vshell
 %define		php_min_version 5.2.0
 %include	/usr/lib/rpm/macros.php
 Summary:	Nagios V-Shell
 Name:		nagios-%{pkg}
 Version:	1.8
-Release:	0.8
+Release:	0.12
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://assets.nagios.com/downloads/exchange/nagiosvshell/%{pkg}.tar.gz
 # Source0-md5:	802a80daa263b441af1b729cb3e7fa35
 Patch0:		config.patch
-BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Patch1:		http-host.patch
+Patch2:		locale.patch
 URL:		http://exchange.nagios.org/directory/Addons/Frontends-(GUIs-and-CLIs)/Web-Interfaces/Nagios-V-2DShell/details
+BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Requires:	nagios-cgi
 Requires:	php-common >= 4:%{php_min_version}
 Requires:	php-date
@@ -51,6 +50,7 @@
 mv %{pkg}/* .
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # standard license
 rm doc/gpl.txt
@@ -62,14 +62,34 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
 cp -p *.php $RPM_BUILD_ROOT%{_appdir}
-cp -a controllers css data js locale views $RPM_BUILD_ROOT%{_appdir}
+cp -a controllers css data js views $RPM_BUILD_ROOT%{_appdir}
 
 cp -p config/vshell.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
+find locale -name '*mo' | while read mofile; do
+	locale=$(basename "$mofile" .mo)
+	case "$locale" in
+	en_EN)
+		locale=en
+		;;
+	es_ES)
+		locale=es
+		;;
+	fr_FR)
+		locale=fr
+		;;
+	esac
+
+	install -d $RPM_BUILD_ROOT%{_datadir}/locale/$locale/LC_MESSAGES
+	cp -p $mofile $RPM_BUILD_ROOT%{_datadir}/locale/$locale/LC_MESSAGES/%{name}.mo
+done
+
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc INSTALL.txt doc/*
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{pkg}.conf
@@ -81,6 +101,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2012/01/07 18:28:54  glen
+- fix localization
+
 Revision 1.8  2012/01/07 17:59:32  glen
 - suggest apc
 

================================================================
Index: packages/nagios-vshell/locale.patch
diff -u /dev/null packages/nagios-vshell/locale.patch:1.1
--- /dev/null	Sat Jan  7 19:29:00 2012
+++ packages/nagios-vshell/locale.patch	Sat Jan  7 19:28:54 2012
@@ -0,0 +1,21 @@
+--- nagios-vshell-1.8/session.inc.php	2011-09-09 17:32:18.000000000 +0300
++++ nagios-vshell-1.8/session.inc.php	2012-01-07 20:26:20.971209175 +0200
+@@ -13,15 +13,13 @@
+ {
+ 	
+ 	//gettext support 
+-	$loc = setlocale(LC_ALL, LANG, LANG.'utf-8', LANG.'utf8', "en_GB.utf8");
++	$loc = setlocale(LC_ALL, LANG, LANG.'.utf-8', LANG.'.utf8', "en_GB.utf8");
+ 	if (!isset($loc)) {
+ 	 echo gettext("Error in setting the correct locale, please report this error with the associated output of  'locale -a' to mguthrie at nagios.com")."<br>";
+ 	}
+-	putenv("LC_ALL=".LANG);
+-	putenv("LANG=".LANG);
+-	bindtextdomain(LANG, 'locale/');
++	putenv("LC_ALL=".LANG.'.utf-8');
+ 	bind_textdomain_codeset(LANG, 'UTF-8');
+-	textdomain(LANG); 
++	textdomain('nagios-vshell');
+ 
+ 
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-vshell/nagios-vshell.spec?r1=1.8&r2=1.9&f=u