Author: megabajt Date: Mon Apr 16 12:50:48 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated to 1.2.0; merged changes from DEVEL
---- Files affected: packages/openttd: openttd.spec (1.102 -> 1.103) , openttd-home_etc.patch (1.5 -> 1.6) ---- Diffs: ================================================================ Index: packages/openttd/openttd.spec diff -u packages/openttd/openttd.spec:1.102 packages/openttd/openttd.spec:1.103 --- packages/openttd/openttd.spec:1.102 Tue Feb 7 23:05:24 2012 +++ packages/openttd/openttd.spec Mon Apr 16 14:50:43 2012 @@ -6,12 +6,12 @@ Summary: An open source reimplementation of the Microprose game "Transport Tycoon Deluxe" Summary(pl.UTF-8): Otwarta reimplementacja gry Transport Tycoon Deluxe Name: openttd -Version: 1.1.5 -Release: 2 +Version: 1.2.0 +Release: 1 License: GPL v2+ Group: X11/Applications/Games Source0: http://binaries.openttd.org/releases/%{version}/%{name}-%{version}-source.tar.xz -# Source0-md5: aea731c9f87c53955269446d580ee19e +# Source0-md5: 7f5181fdd5119336ccbe08f47eab78c1 Source1: %{name}.desktop Source2: %{name}-server.desktop Patch0: %{name}-home_etc.patch @@ -176,6 +176,12 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +%update_icon_cache hicolor + +%postun +%update_icon_cache hicolor + %files %defattr(644,root,root,755) %doc changelog.txt known-bugs.txt readme.txt docs/multiplayer.txt @@ -201,12 +207,21 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.103 2012/04/16 12:50:43 megabajt +- updated to 1.2.0; merged changes from DEVEL + Revision 1.102 2012/02/07 22:05:24 arekm - release 2 +Revision 1.100.2.2 2012/02/02 12:52:27 lisu +- updated to 1.2.0-beta3 + Revision 1.101 2012/02/02 11:10:29 lisu - updated to 1.1.5 [CVE-2012-0049] + +Revision 1.100.2.1 2011/12/29 14:00:47 lisu +- updated to 1.2.0-beta1 Revision 1.100 2011/12/20 19:35:33 arekm - release 2 ================================================================ Index: packages/openttd/openttd-home_etc.patch diff -u packages/openttd/openttd-home_etc.patch:1.5 packages/openttd/openttd-home_etc.patch:1.6 --- packages/openttd/openttd-home_etc.patch:1.5 Sat Jun 7 18:24:27 2008 +++ packages/openttd/openttd-home_etc.patch Mon Apr 16 14:50:43 2012 @@ -39,23 +39,22 @@ if [ "$with_zlib" != "0" ]; then if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then LIBS="$LIBS $zlib" -diff -burN openttd-0.6.0.orig/src/fileio.cpp openttd-0.6.0/src/fileio.cpp ---- openttd-0.6.0.orig/src/fileio.cpp 2008-04-06 12:28:02.523820995 +0200 -+++ openttd-0.6.0/src/fileio.cpp 2008-04-06 12:37:30.727651048 +0200 -@@ -19,6 +19,10 @@ - #endif +--- openttd-1.2.0-beta1/src/fileio.cpp.orig 2011-12-24 10:13:06.000000000 +0100 ++++ openttd-1.2.0-beta1/src/fileio.cpp 2011-12-29 14:58:18.100920008 +0100 +@@ -28,6 +28,10 @@ #include <sys/stat.h> + #include <algorithm> +#ifdef HOME_ETC +#include <home_etc.h> +#endif + - /*************************************************/ - /* FILE IO ROUTINES ******************************/ - /*************************************************/ -@@ -647,7 +651,11 @@ - #if defined(__MORPHOS__) || defined(__AMIGA__) || !defined(WITH_PERSONAL_DIR) - _searchpaths[SP_PERSONAL_DIR] = NULL; + /** Size of the #Fio data buffer. */ + #define FIO_BUFFER_SIZE 512 + +@@ -1077,7 +1081,11 @@ + find_directory(B_USER_SETTINGS_DIRECTORY, &path); + const char *homedir = path.Path(); #else +#ifdef HOME_ETC + const char *hometdir = _HEdir; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/openttd/openttd.spec?r1=1.102&r2=1.103 http://cvs.pld-linux.org/packages/openttd/openttd-home_etc.patch?r1=1.5&r2=1.6 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
