rpms/glest/devel glest-2.0.0-gcc41.patch, NONE, 1.1 glest-2.0.0-unicode.patch, NONE, 1.1 glest.sh, NONE, 1.1 glest.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Aurelien Bompard (abompard)
fedora-extras-commits at redhat.com
Mon Nov 27 20:06:17 UTC 2006
Author: abompard
Update of /cvs/extras/rpms/glest/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5942/devel
Modified Files:
.cvsignore sources
Added Files:
glest-2.0.0-gcc41.patch glest-2.0.0-unicode.patch glest.sh
glest.spec
Log Message:
auto-import glest-2.0.0-1 on branch devel from glest-2.0.0-1.src.rpm
glest-2.0.0-gcc41.patch:
--- NEW FILE glest-2.0.0-gcc41.patch ---
--- ./source/shared_lib/include/graphics/particle.h.gcc41 2006-11-05 23:01:03.000000000 +0100
+++ ./source/shared_lib/include/graphics/particle.h 2006-11-05 23:01:22.000000000 +0100
@@ -310,7 +310,7 @@
void setTrajectoryFrequency(float trajectoryFrequency) {this->trajectoryFrequency= trajectoryFrequency;}
void setPath(Vec3f startPos, Vec3f endPos);
- static Trajectory ProjectileParticleSystem::strToTrajectory(const string &str);
+ static Trajectory strToTrajectory(const string &str);
};
// =====================================================
glest-2.0.0-unicode.patch:
--- NEW FILE glest-2.0.0-unicode.patch ---
--- ./mk/linux/configure.ac.unicode 2006-11-05 22:54:30.000000000 +0100
+++ ./mk/linux/configure.ac 2006-11-05 22:54:44.000000000 +0100
@@ -134,7 +134,7 @@
XIPH_PATH_OGG(, [AC_MSG_ERROR([Please install ogg/vorbis])])
AM_OPTIONS_WXCONFIG
-AM_PATH_WXCONFIG([2.6.0], [WX_AVAILABLE="yes"], [WX_AVAILABLE="no"], [std,gl], [--unicode=no])
+AM_PATH_WXCONFIG([2.6.0], [WX_AVAILABLE="yes"], [WX_AVAILABLE="no"], [std,gl])
AC_SUBST([WX_AVAILABLE])
AC_INIT_JAM
--- NEW FILE glest.sh ---
#!/bin/sh
GLEST_LOCAL_DIR=$HOME/.glest
GLEST_DATA_DIR=/usr/share/glest
GLEST_EXECUTABLE=/usr/libexec/glest/glest
tmplang="$LANG"
test "$LC_MESSAGES" != "" && tmplang="$LC_MESSAGES"
test "$LC_ALL" != "" && tmplang="$LC_ALL"
test "$LANGUAGE" != "" && tmplang="$LANGUAGE"
lang=`echo $tmplang|cut -d "_" -f 1`
case $lang in
da)
lang=dansk.lng
;;
de)
lang=german.lng
;;
eu)
lang=euskara.lng
;;
es)
lang=$(echo español.lng | iconv -f UTF-8 -t ISO-8859-1)
;;
fr)
lang=francais.lng
;;
gl)
lang=galego.lng
;;
hu)
lang=magyar.lng
;;
it)
lang=italiano.lng
;;
nb|nn)
lang=norsk.lng
;;
pt)
lang=portugues.lng
;;
tr)
lang=turkish.lng
;;
*)
lang=english.lng
;;
esac
mkdir -p $GLEST_LOCAL_DIR
cd $GLEST_LOCAL_DIR
for dir in techs data maps tilesets; do
ln -snf $GLEST_DATA_DIR/$dir $dir
done
test -L screens && rm screens
# glest.ini
if [ ! -e glest.ini ]; then
X=$(xdpyinfo|grep "dimensions:"|awk '{print $2}'|cut -d "x" -f 1)
Y=$(xdpyinfo|grep "dimensions:"|awk '{print $2}'|cut -d "x" -f 2)
sed -e s/ScreenWidth=.*/ScreenWidth=$X/g \
-e s/ScreenHeight=.*/ScreenHeight=$Y/g \
$GLEST_DATA_DIR/glest.ini > glest.ini
if [ -f $GLEST_DATA_DIR/data/lang/$lang ]; then
sed -i -e s/Lang=.*/Lang=$lang/g glest.ini
fi
else
# convert configuration from glest 1.1 to glest 1.2
grep -q -e ChangeDisplay -e PathFindLevelsMax glest.ini
if [ $? -eq 0 ]; then
sed -e s/ChangeDisplay=1/Windowed=0/g \
-e s/ChangeDisplay=0/Windowed=1/g \
-e s/PathFindLevelsMax/PathFindNodesMax/g \
-i glest.ini
fi
fi
exec $GLEST_EXECUTABLE "$@"
--- NEW FILE glest.spec ---
Name: glest
Version: 2.0.0
Release: 1%{?dist}
Summary: 3D real time strategy game
Group: Amusements/Games
License: GPL
URL: http://glest.org
Source0: http://dl.sf.net/glest/glest_source_2.0.0.zip
Source1: glest.sh
Patch0: glest-2.0.0-unicode.patch
Patch1: glest-2.0.0-gcc41.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jam, libX11-devel, SDL-devel, openal-devel, xerces-c-devel
BuildRequires: libogg-devel, libvorbis-devel, autoconf, automake
BuildRequires: desktop-file-utils
Requires: glest-data = %{version}
%description
Glest is a free 3D real time strategy game, that can be modified
using XML and a set of tools
%prep
%setup -q -n %{name}_source_%{version}
%patch0 -p1 -b .unicode
%patch1 -p1 -b .gcc41
find . -type f | xargs sed -i -e "s/\r//g"
#find . -type f | while read file; do
# grep -qs "\r\n" $file && dos2unix $file
#done
%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
%configure
#jam %{?_smp_mflags}
jam
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/glest
mkdir -p $RPM_BUILD_ROOT%{_datadir}/glest
install -p -m 755 mk/linux/glest $RPM_BUILD_ROOT%{_libexecdir}/glest/
install -p -m 644 mk/linux/glest.ini $RPM_BUILD_ROOT%{_datadir}/glest/
# Wrapper
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/glest
# Desktop file
cat > glest.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Name=Glest
Comment=Real Time Strategy game
Exec=glest
Icon=%{_datadir}/glest/glest-0.png
StartupNotify=true
Terminal=false
Type=Application
Categories=Application;Game;StrategyGame;
EOF
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
glest.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc docs/README.linux docs/license.txt
%{_bindir}/glest
%{_datadir}/applications/*.desktop
%{_libexecdir}/glest
%{_datadir}/glest
%changelog
* Wed Jul 19 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.0.0-1
- initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glest/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 27 Nov 2006 20:04:44 -0000 1.1
+++ .cvsignore 27 Nov 2006 20:05:47 -0000 1.2
@@ -0,0 +1 @@
+glest_source_2.0.0.zip
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glest/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 27 Nov 2006 20:04:44 -0000 1.1
+++ sources 27 Nov 2006 20:05:47 -0000 1.2
@@ -0,0 +1 @@
+f7716da7a044dbe108c619b0f52621bb glest_source_2.0.0.zip
More information about the scm-commits
mailing list