rpms/glest/F-8 glest.sh,1.5,1.6 glest.spec,1.15,1.16

[Aurelien Bompard (abompard)]

Author: abompard

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

Modified Files:
	glest.sh glest.spec 
Log Message:
* Thu Feb 14 2008 Aurelien Bompard <abompard at fedoraproject.org> 3.0.0-3
- add missing values to glest.ini (bug 431944)



Index: glest.sh
===================================================================
RCS file: /cvs/pkgs/rpms/glest/F-8/glest.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glest.sh	1 Dec 2007 15:57:47 -0000	1.5
+++ glest.sh	14 Feb 2008 07:44:00 -0000	1.6
@@ -75,5 +75,11 @@
     echo "Your video card does not support enough texture units, turning off shadows..."
     sed -i -e "s/Shadows=.*/Shadows=Disabled/g" glest.ini
   fi
+else
+  # New entries in version 3.0:
+  for instruction in ServerIp ServerPort; do
+    grep -qs ^$instruction glest.ini || \
+      grep ^$instruction $GLEST_DATA_DIR/glest.ini >> glest.ini
+  done
 fi
 exec $GLEST_EXECUTABLE "$@"


Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/F-8/glest.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- glest.spec	2 Feb 2008 18:18:45 -0000	1.15
+++ glest.spec	14 Feb 2008 07:44:00 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           glest
 Version:        3.0.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
@@ -10,6 +10,7 @@
 Source1:        glest.sh
 # http://bugs.gentoo.org/attachment.cgi?id=142379
 Patch0:         glest-3.0.0-unicode.patch
+Patch1:         glest-3.0.0-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jam, libX11-devel, SDL-devel, openal-devel, xerces-c-devel
@@ -36,6 +37,7 @@
 %prep
 %setup -q -n glest-source-%{version}
 %patch0 -p0 -b .unicode
+%patch1 -p0 -b .gcc43
 
 find . -type f | xargs sed -i -e "s/\r//g" 
 recode ISO-8859-1..UTF-8 README
@@ -119,6 +121,12 @@
 
 
 %changelog
+* Thu Feb 14 2008 Aurelien Bompard <abompard at fedoraproject.org> 3.0.0-3
+- add missing values to glest.ini (bug 431944)
+
+* Sun Feb 03 2008 Aurelien Bompard <abompard at fedoraproject.org> 3.0.0-2
+- add patch for GCC 4.3 compatibility
+
 * Sat Feb 02 2008 Aurelien Bompard <abompard at fedoraproject.org> 3.0.0-1
 - version 3.0.0
 - use gentoo patch for unicode