rpms/glest/F-8 .cvsignore, 1.4, 1.5 glest.sh, 1.6, 1.7 glest.spec, 1.16, 1.17 sources, 1.4, 1.5

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/pkgs/rpms/glest/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31869/F-8

Modified Files:
	.cvsignore glest.sh glest.spec sources 
Log Message:
* Sat Feb 16 2008 Aurelien Bompard <abompard at fedoraproject.org> 3.1.0-1
- version 3.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glest/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2008 18:18:45 -0000	1.4
+++ .cvsignore	16 Feb 2008 22:01:10 -0000	1.5
@@ -1 +1 @@
-glest-source-3.0.0.tar.gz
+glest-source-3.1.0.tar.bz2


Index: glest.sh
===================================================================
RCS file: /cvs/pkgs/rpms/glest/F-8/glest.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- glest.sh	14 Feb 2008 07:44:00 -0000	1.6
+++ glest.sh	16 Feb 2008 22:01:10 -0000	1.7
@@ -76,10 +76,14 @@
     sed -i -e "s/Shadows=.*/Shadows=Disabled/g" glest.ini
   fi
 else
-  # New entries in version 3.0:
-  for instruction in ServerIp ServerPort; do
+  # Upgrade the .ini file
+  awk -F= '{print $1}' $GLEST_DATA_DIR/glest.ini | grep -v '^;' | while read instruction; do
+    [ -n "$instruction" ] || continue
     grep -qs ^$instruction glest.ini || \
       grep ^$instruction $GLEST_DATA_DIR/glest.ini >> glest.ini
   done
 fi
+# servers.ini
+[ -e servers.ini ] || cp $GLEST_DATA_DIR/servers.ini .
+# launch the game
 exec $GLEST_EXECUTABLE "$@"


Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/F-8/glest.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- glest.spec	14 Feb 2008 07:44:00 -0000	1.16
+++ glest.spec	16 Feb 2008 22:01:10 -0000	1.17
@@ -1,12 +1,12 @@
 Name:           glest
-Version:        3.0.0
-Release:        3%{?dist}
+Version:        3.1.0
+Release:        1%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://glest.org
-Source0:        http://dl.sf.net/glest/glest-source-%{version}.tar.gz
+Source0:        http://dl.sf.net/glest/glest-source-%{version}.tar.bz2
 Source1:        glest.sh
 # http://bugs.gentoo.org/attachment.cgi?id=142379
 Patch0:         glest-3.0.0-unicode.patch
@@ -36,7 +36,7 @@
 
 %prep
 %setup -q -n glest-source-%{version}
-%patch0 -p0 -b .unicode
+#%%patch0 -p0 -b .unicode
 %patch1 -p0 -b .gcc43
 
 find . -type f | xargs sed -i -e "s/\r//g" 
@@ -49,8 +49,8 @@
 %build
 #cd mk/linux
 #sed -i -e "s/\r//g" autogen.sh configure.ac glest.ini Jamfile Jamrules mk/jam/* mk/autoconf/*
-chmod +x autogen.sh
-./autogen.sh
+#chmod +x autogen.sh
+#./autogen.sh
 %configure
 #jam %{?_smp_mflags}
 jam
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Sat Feb 16 2008 Aurelien Bompard <abompard at fedoraproject.org> 3.1.0-1
+- version 3.1.0
+
 * Thu Feb 14 2008 Aurelien Bompard <abompard at fedoraproject.org> 3.0.0-3
 - add missing values to glest.ini (bug 431944)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glest/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2008 18:18:45 -0000	1.4
+++ sources	16 Feb 2008 22:01:10 -0000	1.5
@@ -1 +1 @@
-899cf1b5dba702348a5412806bb60487  glest-source-3.0.0.tar.gz
+35b264e437c1136e4c56fee33ae0f047  glest-source-3.1.0.tar.bz2