Author: wiget Date: Sun Jun 7 09:57:01 2009 GMT Module: packages Tag: HEAD ---- Log message: - updated to 3.2.2
---- Files affected: packages/glest: glest-polish.patch (1.1 -> 1.2) , glest.spec (1.17 -> 1.18) , glest-cstdio.patch (NONE -> 1.1) (NEW), glest-ini.patch (NONE -> 1.1) (NEW), glest-lua.patch (NONE -> 1.1) (NEW), glest-home_etc.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/glest/glest-polish.patch diff -u packages/glest/glest-polish.patch:1.1 packages/glest/glest-polish.patch:1.2 --- packages/glest/glest-polish.patch:1.1 Tue Aug 1 22:00:39 2006 +++ packages/glest/glest-polish.patch Sun Jun 7 11:56:56 2009 @@ -1,8 +1,12 @@ ---- polish.lng.orig 2006-07-31 22:17:55.945633000 +0200 -+++ polish.lng 2006-07-31 22:16:24.000000000 +0200 -@@ -6,12 +6,14 @@ +--- glest-3.2.2/polish.lng.pl 2009-06-07 10:50:04.000000000 +0200 ++++ glest-3.2.2/polish.lng 2009-06-07 11:09:32.000000000 +0200 +@@ -4,14 +4,19 @@ + 3dAnd2dArt=Grafika 3D i 2D + 2dArtAndWeb=Grafika i Web 2D About=Info ++Address=Adres AlreadyUpgraded=Juz ulepszone ++All=Wszystko AmbientVolume=Glosnosc ogolna +Animation=Animacja Armor=Pancerz @@ -12,10 +16,21 @@ AttackStopped=Atak zatrzymany AttackStrenght=Obrazenia +AutoConfig=Autokonfig. ++BattleOver=Bitwa zakończona Build=Buduj BuildSpeed=Szybkosc budowania BuildingNoPlace=Budynek nie moze byc tu ulokowany -@@ -28,9 +30,8 @@ +@@ -22,31 +27,44 @@ CameraModeSet=Tryb kamery ustawiony na + CanRepair=Moze naprawic + Cancel=Anuluj + Canceled=Anulowane ++ChatMode=Tryb pogawedki + Closed=Zamkniete + Command=Dowodztwo + CommonCommand=Dowodzenie grupa ++Connect=Polacz ++Connected=Polaczone ++ConnectedToServer=Polaczono do serwera Config=Opcje Consume=Zzerac Control=Kontrola @@ -24,10 +39,20 @@ -CurrentGlestIniSettings=Obecne ustawienia glest.ini +Cpu=Komputer +CpuUltra=Komp. (Ultra) ++CustomGame=Niestandardowa gra Deaths=Polegli Defeat=Kleska Deleting=Usuwanie -@@ -39,14 +40,15 @@ ++Difficulty=Trudnosc ++Difficulty0=Bardzo latwo ++Difficulty1=Latwo ++Difficulty2=Srednio ++Difficulty3=Trudno ++Difficulty4=Bardzo Trudno ++Difficulty5=Oblakanczo + Disabled=Zablokowane ++Disconnect=Rozlacz + Discount=Znizka Ep=EP EpCost=Koszt EP Exit=Wyjscie @@ -49,14 +74,17 @@ GamePaused=Gra zapauzowana GameResumed=Gra wznowiona GameSpeedSet=Szybkosc gry ustawiona na -@@ -60,13 +62,15 @@ +@@ -59,67 +77,81 @@ Initializing=Inicjalizacja + InvalidOrder=Polecenie jest nieprawidlowe InvalidPosition=Pozycja jest nieprawidlowa Kills=Zabici ++JoinGame=Dolacz do gry Languaje=Jezyk +LinuxPort=Wersja dla Linuxa Load=Zaladunek - LoadedSpeed=Szybkosc zaladunku +-LoadedSpeed=Szybkosc zaladunku -Loading=Laduje sie ++LoadedSpeed=Szybkosc z zaladunkiem +Loading=Ladowanie Map=Mapa -MaxFilterAnisotropy=Max Filter Anizotropii @@ -69,8 +97,15 @@ MeetingPoint=Miejsce spotkania Morph=Przemien MorphSpeed=Szybkosc przemiany -@@ -78,14 +82,14 @@ + Move=Rusz + MusicVolume=Glosnosc muzyki ++Network=Siec + No=Nie ++NotConnected=Nie polaczono + None=Zaden + Normal=normalne Ok=OK ++Options=Opcje OpenGlExtensions=Rozszerzenia OpenGlInfo=OpenGL Info -OpenGlMaxLights=Max swiatlo @@ -88,7 +123,10 @@ OpenGlVersion=Wersja OrdersOnQueue=Polecenia w kolejce Play=Graj -@@ -95,21 +99,22 @@ + PlayNow=Graj teraz! + Player=Gracz ++Port=Port + Produce=Produkuj Producing=Produkowanie ProductionSpeed=Szybkosc produkcji Programming=Programowanie @@ -107,6 +145,10 @@ -ShadowMapLike=Mapa cieni -ShadowVolumes=Mapa glosnosci +Score=Wynik ++Server=Serwer ++ServerType=Typ serwera ++ServerTypeNew=Nowy ++ServerTypePrevious=Poprzedni +ShadowMapping=Mapa cieni Shadows=Cienie Sight=Wzrok @@ -116,9 +158,23 @@ SomeOrdersFailed=Niektore polecenia nie moga byc wydane SoundAndMusic=Dzwiek i muzyka SplashRadius=Promien rozbryzgu -@@ -135,5 +140,5 @@ + StartingToUpgrade=Zaczynajac ulepszenie + Stop=Stop + Store=Skladuje ++Tip=Wskazowka + Team=Druzyna + TechTree=Drzewo technologii + Textures3D=Tekstury 3D + Tileset=Srodowisko ++Tutorial=Samouczek + UnitAddedToProductionQueue=Jednostka dodana do kolejki produkcji + UnitNoPlace=Jednostka nie moze zostac umieszczona + UnitNoReqs=Jednostka nie spelnia wymagan +@@ -134,6 +166,7 @@ Upgrades=Ulepszenia + Upgrading=Ulepszanie Victory=Zwyciestwo WalkSpeed=Predkosc ++WaitingHost=Oczekiwanie na serwer Yes=Tak -YouLose=Przegrales -YouWin=Wygrales ================================================================ Index: packages/glest/glest.spec diff -u packages/glest/glest.spec:1.17 packages/glest/glest.spec:1.18 --- packages/glest/glest.spec:1.17 Sat Oct 20 04:07:12 2007 +++ packages/glest/glest.spec Sun Jun 7 11:56:56 2009 @@ -1,61 +1,68 @@ # $Revision$, $Date$ # #TODO -# - patch for search glest.ini (HOME_ETC) in glest_game/config.cpp glest_game/main_menu.cpp glest_game/renderer.cpp # - copy glest_game directory (data game) from SOURCE1 without program source files # - check for additional xorg deps +%define data_ver 3.2.1 Summary: Glest - 3D real time strategy game Summary(pl.UTF-8): Glest - Strategia 3D czasu rzeczywistego Name: glest -Version: 2.0.1 +Version: 3.2.2 Release: 1 -License: GPL +License: GPL v2+, Creative Commons Attribution-ShareAlike Group: X11/Applications/Games Source0: http://dl.sourceforge.net/glest/%{name}_source_%{version}.zip -# Source0-md5: 2d35a5d08331957f63240cadc9766b75 -Source1: http://dl.sourceforge.net/glest/%{name}_data_%{version}.zip -# Source1-md5: 0ca333baa78328f97c30a22063ea19fc +# Source0-md5: 1e961f49c1fb0e59e1e1483d66099a55 +Source1: http://dl.sourceforge.net/glest/%{name}_data_%{data_ver}.zip +# Source1-md5: d67de58e0912925e8ddbd0b25a0d2b50 Source2: http://www.glest.org/files/contrib/translations/catala_1.2.2.zip # Source2-md5: 0ff52ece4c408f3a01a54dda8f17e994 -Source3: http://www.glest.org/files/contrib/translations/cesky_1.2.1.zip -# Source3-md5: a1b0063b7ecc7ed14689c63c31b34cf3 +Source3: http://www.glest.org/files/contrib/translations/cesky_3.1.2.zip +# Source3-md5: ae7e2b0ad4bc8622ebeb2e178816ddbd Source4: http://www.glest.org/files/contrib/translations/danish_1.0.9.zip # Source4-md5: 10a96d53549c7bd50c842dc9d1bd1592 -Source5: http://www.glest.org/files/contrib/translations/deutsch_1.0.1.zip -# Source5-md5: d1debba1dd35af8115fbe3bc5e660555 +Source5: http://www.glest.org/files/contrib/translations/german_3.1.2.zip +# Source5-md5: 71fd759e8c0dacffc50d2d732cd53927 Source6: http://www.glest.org/files/contrib/translations/dutch_1.0.9.zip # Source6-md5: 75b130468743cd9f74235e5eaca88ee3 Source7: http://www.glest.org/files/contrib/translations/euskara_1.2.2.zip # Source7-md5: b06b8823100e49b537f4be42cd4674f0 -Source8: http://www.glest.org/files/contrib/translations/francais_2.0.0.zip -# Source8-md5: 0cc6e7c7029c79f1bf61d3a3bdb441d0 +# http://www.glest.org/files/contrib/translations/français_3.1.2.zip +Source8: francais_3.1.2.zip +# Source8-md5: 8446f46d9b894ede3ace90edac8663d7 Source9: http://www.glest.org/files/contrib/translations/hebrew_1.2.1.zip # Source9-md5: 01cc8f8b53cb77e37de4abbb056a47f1 -Source10: http://www.glest.org/files/contrib/translations/italiano_2.0.0.zip -# Source10-md5: 9869a946227b31141b4166c1ca627c9a -Source11: http://www.glest.org/files/contrib/translations/magyar_1.1.0.zip -# Source11-md5: 3dafdbafc1fac2536565bab122b63ece -Source12: http://www.glest.org/files/contrib/translations/norsk_0.8.1.zip -# Source12-md5: 2be1ef1472431ddc361526590d4d82b5 +Source10: http://www.glest.org/files/contrib/translations/italian_3.1.0.zip +# Source10-md5: f11bbae0468d32fb845660b6dc8e4856 +Source11: http://www.glest.org/files/contrib/translations/magyar_3.2-alpha1.zip +# Source11-md5: 8a68ce97215f87daaded7b5df9263caa +Source12: http://www.glest.org/files/contrib/translations/norsk_3.1.2.zip +# Source12-md5: 56113995e1e8da088ccdf2841dc663dc Source13: http://www.glest.org/files/contrib/translations/polish_1.0.9.zip # Source13-md5: 977df518ef4523fce1e833769e760e29 Source14: http://www.glest.org/files/contrib/translations/portugues_2.0.0.zip # Source14-md5: f133c241ac021ad30d54d0ef48b0f64f -Source15: http://www.glest.org/files/contrib/translations/russian_1.0.9.zip -# Source15-md5: a703c513b57664f03c857b656cc571ae +Source15: http://www.glest.org/files/contrib/translations/russian_3.1.2.zip +# Source15-md5: 751481b6615f5e24c884fcc3837c3b4e Source16: http://www.glest.org/files/contrib/translations/slovak_2.0.0.zip # Source16-md5: a31d07ed2c24da87628590e43f6c131f -Source17: http://www.glest.org/files/contrib/translations/turkish_1.0.9.zip -# Source17-md5: 5ec892e82722b8de359edccb95903bbc -Source18: glest.desktop -Source19: glest.png +Source17: http://www.glest.org/files/contrib/translations/turkish_3.1.2.zip +# Source17-md5: 7958618435938c2cdf067ea6917d144b +Source18: http://www.glest.org/files/contrib/translations/greek_3.0.0.zip +# Source18-md5: 06a51c3eda91b6f8b3e0f777f3136cff +Source19: http://www.glest.org/files/contrib/translations/srpski_2.0.1.zip +# Source19-md5: c00259c351125138f95c57776a66e3b6 +Source50: glest.desktop +Source51: glest.png Patch0: %{name}-polish.patch -Patch1: %{name}-home_etc.patch +Patch1: %{name}-lua.patch +Patch2: %{name}-cstdio.patch +Patch3: %{name}-ini.patch URL: http://www.glest.org/ -BuildRequires: OpenAL-devel -BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel BuildRequires: Mesa-libGLw-devel +BuildRequires: OpenAL-devel +BuildRequires: OpenGL-devel BuildRequires: SDL-devel >= 1.2.5 BuildRequires: dos2unix BuildRequires: jam >= 2.5 @@ -63,6 +70,7 @@ BuildRequires: libvorbis-devel BuildRequires: unzip BuildRequires: xerces-c-devel +Buildrequires: lua51-devel Buildrequires: xorg-lib-libXdamage-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -77,14 +85,16 @@ XML-a i zestawu narzędzi. %prep -%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 +%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 for file in xml ini log txt html lng; do find ./ -noleaf -type f -name \*.$file -exec dos2unix '{}' \; done find mk -noleaf -type f -exec dos2unix '{}' \; -%patch0 -p0 +%patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 chmod +x mk/linux/autogen.sh %build @@ -97,21 +107,18 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sysconfdir}/%{name},%{_bindir},%{_pixmapsdir},%{_desktopdir}} -install mk/linux/glest $RPM_BUILD_ROOT%{_bindir}/%{name}_game +install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sysconfdir}/%{name},%{_bindir},%{_pixmapsdir},%{_desktopdir},%{_libdir}} +install mk/linux/glest $RPM_BUILD_ROOT%{_libdir}/%{name}_game install mk/linux/glest.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/glest.ini -#ln -s %{_sysconfdir}/%{name}/%{name}.ini $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.ini -#ln -s %{_bindir}/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name} cd glest_game -#install configuration.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/configuration.xml -#ln -s %{_sysconfdir}/%{name}/configuration.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/configuration.xml -#rm configuration.xml rm glest.* rm -rf screens cp -r ./* $RPM_BUILD_ROOT%{_datadir}/%{name} -install ../polish.lng $RPM_BUILD_ROOT%{_datadir}/%{name}/data/lang/ -install %{SOURCE18} $RPM_BUILD_ROOT%{_desktopdir} -install %{SOURCE19} $RPM_BUILD_ROOT%{_pixmapsdir} +for LNG in ../*.lng; do + install $LNG $RPM_BUILD_ROOT%{_datadir}/%{name}/data/lang/ +done +install %{SOURCE50} $RPM_BUILD_ROOT%{_desktopdir} +install %{SOURCE51} $RPM_BUILD_ROOT%{_pixmapsdir} cat << 'EOF' > $RPM_BUILD_ROOT%{_bindir}/%{name} #!/bin/sh @@ -125,12 +132,15 @@ if [ ! -d "${GLEST_HOME}" ]; then mkdir -p ${GLEST_HOME} cp -a /etc/glest/* ${GLEST_HOME} + for F in %{_datadir}/%{name}/*; do + ln -s $F ${GLEST_HOME}/ + done fi [ ! -d "${GLEST_HOME}/screens" ] && mkdir -p ${GLEST_HOME}/screens -cd /usr/share/glest -/usr/bin/glest_game +cd ${GLEST_HOME} +%{_libdir}/glest_game EOF %clean @@ -138,9 +148,10 @@ %files %defattr(644,root,root,755) -%doc docs/README docs/README.linux docs/license.txt +%doc docs/readme.txt docs/readme_linux.txt docs/code_license.txt docs/data_license.txt %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/* -%attr(755,root,root) %{_bindir}/* +%attr(755,root,root) %{_bindir}/glest +%attr(755,root,root) %{_libdir}/glest_game %{_datadir}/%{name} %{_desktopdir}/*.desktop %{_pixmapsdir}/* @@ -151,6 +162,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2009/06/07 09:56:56 wiget +- updated to 3.2.2 + Revision 1.17 2007/10/20 02:07:12 wolvverine - rel.1 ================================================================ Index: packages/glest/glest-cstdio.patch diff -u /dev/null packages/glest/glest-cstdio.patch:1.1 --- /dev/null Sun Jun 7 11:57:01 2009 +++ packages/glest/glest-cstdio.patch Sun Jun 7 11:56:56 2009 @@ -0,0 +1,10 @@ +--- glest-3.2.2/source/shared_lib/sources/platform/posix/socket.cpp.wiget 2009-06-06 13:20:06.000000000 +0200 ++++ glest-3.2.2/source/shared_lib/sources/platform/posix/socket.cpp 2009-06-06 13:21:13.000000000 +0200 +@@ -12,6 +12,7 @@ + #include <cstdlib> + #include <stdexcept> + #include <sstream> ++#include <cstdio> + #if defined(HAVE_SYS_IOCTL_H) + #define BSD_COMP /* needed for FIONREAD on Solaris2 */ + #include <sys/ioctl.h> ================================================================ Index: packages/glest/glest-ini.patch diff -u /dev/null packages/glest/glest-ini.patch:1.1 --- /dev/null Sun Jun 7 11:57:01 2009 +++ packages/glest/glest-ini.patch Sun Jun 7 11:56:56 2009 @@ -0,0 +1,11 @@ +--- glest-3.2.2/mk/linux/glest.ini.wiget 2009-06-07 10:45:29.000000000 +0200 ++++ glest-3.2.2/mk/linux/glest.ini 2009-06-07 10:46:36.000000000 +0200 +@@ -23,7 +23,7 @@ FogOfWarSmoothingFrameSkip=3 + FontConsole=-*-*-*-*-*-*-12-*-*-*-*-*-*-* + FontDisplay=-*-*-*-*-*-*-12-*-*-*-*-*-*-* + FontMenu=-*-*-*-*-*-*-12-*-*-*-*-*-*-* +-Lang=english.lng ++Lang=english + MaxLights=1 + NetworkConsistencyChecks=1 + PhotoMode=0 ================================================================ Index: packages/glest/glest-lua.patch diff -u /dev/null packages/glest/glest-lua.patch:1.1 --- /dev/null Sun Jun 7 11:57:01 2009 +++ packages/glest/glest-lua.patch Sun Jun 7 11:56:56 2009 @@ -0,0 +1,28 @@ +--- glest-3.2.2/mk/linux/mk/autoconf/check_lua.m4.wiget 2009-06-06 13:11:59.000000000 +0200 ++++ glest-3.2.2/mk/linux/mk/autoconf/check_lua.m4 2009-06-06 13:13:06.000000000 +0200 +@@ -43,6 +43,25 @@ fi + AC_CHECK_LIB([m], [pow], lib_m=" -lm") + AC_LANG_PUSH([C++]) + for p in $paths ; do ++ AC_MSG_CHECKING([for lua.hpp in ${p}/include/lua51]) ++ if test -f ${p}/include/lua51/lua.hpp; then ++ AC_MSG_RESULT([yes]) ++ save_CFLAGS=$CFLAGS ++ save_LDFLAGS=$LDFLAGS ++ CFLAGS="$CFLAGS" ++ LDFLAGS="-L${p}/lib $LDFLAGS $lib_m" ++ AC_CHECK_LIB(lua51, luaL_newstate, ++ [ ++ LUA_AVAILABLE=yes ++ LUA_LIBS="-L${p}/lib -llua51" ++ LUA_CFLAGS="-I${p}/include/lua51" ++ ]) ++ CFLAGS=$save_CFLAGS ++ LDFLAGS=$save_LDFLAGS ++ break ++ else ++ AC_MSG_RESULT([no]) ++ fi + AC_MSG_CHECKING([for lua.hpp in ${p}/include/lua5.1]) + if test -f ${p}/include/lua5.1/lua.hpp; then + AC_MSG_RESULT([yes]) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glest/glest-polish.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glest/glest.spec?r1=1.17&r2=1.18&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
