rpms/glest/devel glest-3.2.0-gcc44.patch, NONE, 1.1 glest.sh, 1.8, 1.9 glest.spec, 1.21, 1.22
Aurelien Bompard
abompard at fedoraproject.org
Tue Feb 10 21:38:35 UTC 2009
Author: abompard
Update of /cvs/pkgs/rpms/glest/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19877/devel
Modified Files:
glest.sh glest.spec
Added Files:
glest-3.2.0-gcc44.patch
Log Message:
* Tue Feb 10 2009 Aurelien Bompard <abompard at fedoraproject.org> 3.2.0-1
- version 3.2.0
glest-3.2.0-gcc44.patch:
--- NEW FILE glest-3.2.0-gcc44.patch ---
diff -up ./shared_lib/sources/util/util.cpp.gcc44 ./shared_lib/sources/util/util.cpp
--- ./shared_lib/sources/util/util.cpp.gcc44 2009-02-10 20:33:44.000000000 +0100
+++ ./shared_lib/sources/util/util.cpp 2009-02-10 20:33:56.000000000 +0100
@@ -15,6 +15,7 @@
#include <cassert>
#include <stdexcept>
#include <cstring>
+#include <cstdio>
#include "leak_dumper.h"
Index: glest.sh
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- glest.sh 27 Feb 2008 06:49:25 -0000 1.8
+++ glest.sh 10 Feb 2009 21:38:05 -0000 1.9
@@ -16,43 +16,43 @@
case $lang in
da)
- lang=dansk.lng
+ lang=dansk
;;
de)
- lang=german.lng
+ lang=german
;;
eu)
- lang=euskara.lng
+ lang=euskara
;;
es)
- lang=$(echo español.lng | iconv -f UTF-8 -t ISO-8859-1)
+ lang=$(echo español | iconv -f UTF-8 -t ISO-8859-1)
;;
fr)
- lang=francais.lng
+ lang=francais
;;
gl)
- lang=galego.lng
+ lang=galego
;;
hu)
- lang=magyar.lng
+ lang=magyar
;;
it)
- lang=italiano.lng
+ lang=italiano
;;
nb|nn)
- lang=norsk.lng
+ lang=norsk
;;
pt)
- lang=pt-BR.lng
+ lang=pt-BR
;;
tr)
- lang=turkish.lng
+ lang=turkish
;;
gr)
- lang=greek.lng
+ lang=greek
;;
*)
- lang=english.lng
+ lang=english
;;
esac
@@ -85,6 +85,8 @@
grep -qs ^$instruction glest.ini || \
grep ^$instruction $GLEST_DATA_DIR/glest.ini >> glest.ini
done
+ # Remove lang pack extension
+ sed -i -e 's/Lang=\(.*\)\.lng/Lang=\1/g' glest.ini
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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- glest.spec 10 Feb 2009 19:23:32 -0000 1.21
+++ glest.spec 10 Feb 2009 21:38:05 -0000 1.22
@@ -8,6 +8,7 @@
URL: http://glest.org
Source0: http://www.titusgames.de/glest-source-3.2.0.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
@@ -33,7 +34,7 @@
%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
More information about the fedora-extras-commits
mailing list