rpms/glest/devel .cvsignore, 1.9, 1.10 glest.sh, 1.10, 1.11 glest.spec, 1.26, 1.27 sources, 1.9, 1.10

[Aurelien Bompard]

Author: abompard

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

Modified Files:
	.cvsignore glest.sh glest.spec sources 
Log Message:
* Fri Aug 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  3.2.2-1
- rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Feb 2009 08:02:17 -0000	1.9
+++ .cvsignore	21 Aug 2009 19:46:55 -0000	1.10
@@ -1 +1 @@
-glest-source-3.2.1.tar.bz2
+glest-source-3.2.2.tar.bz2


Index: glest.sh
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- glest.sh	28 Feb 2009 08:02:17 -0000	1.10
+++ glest.sh	21 Aug 2009 19:46:55 -0000	1.11
@@ -64,7 +64,7 @@ esac
 
 mkdir -p $GLEST_LOCAL_DIR
 cd $GLEST_LOCAL_DIR
-for dir in techs data maps scenarios tilesets; do
+for dir in techs data maps scenarios tilesets tutorials; do
     ln -snf $GLEST_DATA_DIR/$dir $dir
 done
 test -L screens && rm screens


Index: glest.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/glest.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- glest.spec	25 Jul 2009 00:18:28 -0000	1.26
+++ glest.spec	21 Aug 2009 19:46:55 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           glest
-Version:        3.2.1
-Release:        2%{?dist}
+Version:        3.2.2
+Release:        1%{?dist}
 Summary:        3D real time strategy game
 
 Group:          Amusements/Games
@@ -8,13 +8,16 @@ License:        GPLv2+
 URL:            http://glest.org
 Source0:        http://www.titusgames.de/glest-source-%{version}.tar.bz2
 Source1:        glest.sh
+Patch0:         glest-3.2.2-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  jam, libX11-devel, SDL-devel, openal-devel, xerces-c-devel
+BuildRequires:  jam, libX11-devel, SDL-devel, openal-soft-devel, xerces-c-devel
 BuildRequires:  libogg-devel, libvorbis-devel, lua-devel, wxGTK-devel
 BuildRequires:  desktop-file-utils, recode
 
-Requires:       glest-data = %{version}
+# Data version is not in sync:
+# http://glest.org/glest_board/index.php?topic=4252.0
+Requires:       glest-data >= 3.2.1
 # Used in the wrapper script
 Requires:       glx-utils
 Requires:       opengl-games-utils
@@ -33,8 +36,9 @@ exist in the environment and can be cont
 
 %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
+#recode ISO-8859-1..UTF-8 README
 
 
 %build
@@ -98,7 +102,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README README.linux license.txt
 %{_bindir}/glest
 %{_bindir}/glest_editor
 %{_bindir}/glest-wrapper
@@ -108,6 +111,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  3.2.2-1
+- rebuild
+
+* Fri Jul 26 2009 Aurelien Bompard <abompard at fedoraproject.org> 3.2.1-3
+- fix wrapper script (#501181)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glest/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Feb 2009 08:02:17 -0000	1.9
+++ sources	21 Aug 2009 19:46:55 -0000	1.10
@@ -1 +1 @@
-a57d19a4078980ee4c2c010d5a2b75d7  glest-source-3.2.1.tar.bz2
+f4b1df9d80f91d863b697af47c96025a  glest-source-3.2.2.tar.bz2