rpms/glest/devel .cvsignore, 1.8, 1.9 glest.sh, 1.9, 1.10 glest.spec, 1.23, 1.24 sources, 1.8, 1.9

[Aurelien Bompard]

Author: abompard

Update of /cvs/pkgs/rpms/glest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16031/devel

Modified Files:
	.cvsignore glest.sh glest.spec sources 
Log Message:
* Sun Feb 15 2009 Aurelien Bompard <abompard at fedoraproject.org> 3.2.1-1
- version 3.2.1
- drop patch0 (merged upstream)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Feb 2009 19:23:32 -0000	1.8
+++ .cvsignore	28 Feb 2009 08:02:17 -0000	1.9
@@ -1 +1 @@
-glest-source-3.2.0.tar.bz2
+glest-source-3.2.1.tar.bz2


Index: glest.sh
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- glest.sh	10 Feb 2009 21:38:05 -0000	1.9
+++ glest.sh	28 Feb 2009 08:02:17 -0000	1.10
@@ -15,6 +15,9 @@
 lang=`echo $tmplang|cut -d "_" -f 1`
 
 case $lang in
+  cz)
+    lang=cesky
+  ;;
   da)
     lang=dansk
   ;;
@@ -25,7 +28,7 @@
     lang=euskara
   ;;
   es)
-    lang=$(echo español | iconv -f UTF-8 -t ISO-8859-1)
+    lang=espanol
   ;;
   fr)
     lang=francais
@@ -37,13 +40,13 @@
     lang=magyar
   ;;
   it)
-    lang=italiano
+    lang=italian
   ;;
   nb|nn)
     lang=norsk
   ;;
   pt)
-    lang=pt-BR
+    lang=brazilian
   ;;
   tr)
     lang=turkish
@@ -51,6 +54,9 @@
   gr)
     lang=greek
   ;;
+  ru)
+    lang=russian
+  ;;
   *)
     lang=english
   ;;
@@ -87,6 +93,12 @@
   done
   # Remove lang pack extension
   sed -i -e 's/Lang=\(.*\)\.lng/Lang=\1/g' glest.ini
+  # Switch to english if the lang file can't be found
+  # (instead of aborting without graphical warning)
+  curlang=`awk -F= '/^Lang=/ {print $1}' glest.ini`
+  if [ ! -f $GLEST_DATA_DIR/data/lang/$curlang.lng ]; then
+      sed -i -e s/Lang=.*/Lang=english/g glest.ini
+  fi
 fi
 # servers.ini
 [ -e servers.ini ] || cp $GLEST_DATA_DIR/servers.ini .


Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- glest.spec	24 Feb 2009 21:59:51 -0000	1.23
+++ glest.spec	28 Feb 2009 08:02:17 -0000	1.24
@@ -1,14 +1,13 @@
 Name:           glest
-Version:        3.2.0
-Release:        2%{?dist}
+Version:        3.2.1
+Release:        1%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://glest.org
-Source0:        http://www.titusgames.de/glest-source-3.2.0.tar.bz2
+Source0:        http://www.titusgames.de/glest-source-%{version}.tar.bz2
 Source1:        glest.sh
-Patch0:         glest-3.2.0-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jam, libX11-devel, SDL-devel, openal-devel, xerces-c-devel
@@ -34,7 +33,6 @@
 
 %prep
 %setup -q -n %{name}-source-%{version}
-%patch0 -p0 -b .gcc44
 find . -type f | xargs sed -i -e "s/\r//g" 
 recode ISO-8859-1..UTF-8 README
 
@@ -110,6 +108,10 @@
 
 
 %changelog
+* Sun Feb 15 2009 Aurelien Bompard <abompard at fedoraproject.org> 3.2.1-1
+- version 3.2.1
+- drop patch0 (merged upstream)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Feb 2009 19:23:32 -0000	1.8
+++ sources	28 Feb 2009 08:02:17 -0000	1.9
@@ -1 +1 @@
-5f307eba73e87d4367fd6bcbffa8bb5d  glest-source-3.2.0.tar.bz2
+a57d19a4078980ee4c2c010d5a2b75d7  glest-source-3.2.1.tar.bz2