diff --git a/.gitignore b/.gitignore index ff2b743..28cd5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ asc-2.2.0.0.tar.bz2 /asc-2.4.0.0.tar.bz2 /asc-2.5.0.0.tar.bz2 +/asc-2.6.0.0.tar.bz2 diff --git a/asc-2.4.0.0-gcc47.patch b/asc-2.4.0.0-gcc47.patch deleted file mode 100644 index 0df68a0..0000000 --- a/asc-2.4.0.0-gcc47.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- asc-2.4.0.0/source/graphics/blitter.h 2008-07-11 23:26:58.000000000 +0200 -+++ asc-2.4.0.0.new/source/graphics/blitter.h 2012-01-15 14:36:39.753033150 +0100 -@@ -928,6 +927,7 @@ - }; - - -+#include "drawing.h" - - extern const int ColorMerger_Alpha_XLAT_Table_shadings[8]; - ---- asc-2.4.0.0/source/graphics/drawing.h 2008-06-29 13:25:41.000000000 +0200 -+++ asc-2.4.0.0.new/source/graphics/drawing.h 2012-01-15 14:37:33.193034937 +0100 -@@ -169,7 +169,7 @@ - PixelType* pix = (PixelType*)( surf.pixels() ); - pix += pos.y * surf.pitch()/pixelsize + pos.x; - -- assign ( src, pix ); -+ this->assign ( src, pix ); - }; - }; - ---- asc-2.4.0.0/source/itemrepository.cpp 2009-11-01 12:05:42.000000000 +0100 -+++ asc-2.4.0.0.new/source/itemrepository.cpp 2012-01-14 12:06:59.420909604 +0100 -@@ -88,7 +88,7 @@ - t->filename = fileName; - t->location = location; - t->archive = prc.getArchive(); -- add ( t ); -+ this->add ( t ); - } - - -@@ -110,7 +110,7 @@ - t->archive = stream.readString(); - dataLoaderTicker(); - -- add ( t ); -+ this->add ( t ); - // add ( T::newFromStream(stream )); - } - } diff --git a/asc-2.5.0.0-lua-5.2.patch b/asc-2.5.0.0-lua-5.2.patch deleted file mode 100644 index fb0d084..0000000 --- a/asc-2.5.0.0-lua-5.2.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -up asc-2.5.0.0/source/lua/commands_wrap.cxx.lua-52 asc-2.5.0.0/source/lua/commands_wrap.cxx ---- asc-2.5.0.0/source/lua/commands_wrap.cxx.lua-52 2012-05-19 11:30:39.000000000 -0400 -+++ asc-2.5.0.0/source/lua/commands_wrap.cxx 2013-05-10 11:27:27.549984527 -0400 -@@ -10,6 +10,13 @@ - - #define SWIGLUA - -+#ifndef lua_strlen -+#define lua_strlen(L,i) lua_rawlen(L, (i)) -+#endif -+ -+#ifndef lua_pushglobaltable -+#define lua_pushglobaltable(L) lua_pushvalue(L, LUA_GLOBALSINDEX) -+#endif - - #ifdef __cplusplus - /* SwigValueWrapper is described in swig.swg */ -@@ -6159,7 +6166,7 @@ fail: - } - #endif - --static const struct luaL_reg swig_commands[] = { -+static const struct luaL_Reg swig_commands[] = { - { "getActiveMap", _wrap_getActiveMap}, - { "repaintMap", _wrap_repaintMap}, - { "getObjectType", _wrap_getObjectType}, -@@ -6587,7 +6594,7 @@ SWIGEXPORT int SWIG_init(lua_State* L) - { - int i; - /* start with global table */ -- lua_pushvalue(L,LUA_GLOBALSINDEX); -+ lua_pushglobaltable(L); - /* SWIG's internal initalisation */ - SWIG_InitializeModule((void*)L); - SWIG_PropagateClientData(); -diff -up asc-2.5.0.0/source/lua/luastate.cpp.lua-52 asc-2.5.0.0/source/lua/luastate.cpp ---- asc-2.5.0.0/source/lua/luastate.cpp.lua-52 2012-05-19 11:30:39.000000000 -0400 -+++ asc-2.5.0.0/source/lua/luastate.cpp 2013-05-10 11:20:57.456998471 -0400 -@@ -12,6 +12,9 @@ extern "C" - - #include "luastate.h" - -+#ifndef lua_open -+#define lua_open() luaL_newstate() -+#endif - - class LuaStatePrivate { - public: -diff -up asc-2.5.0.0/source/lua/mapedcommands_wrap.cxx.lua-52 asc-2.5.0.0/source/lua/mapedcommands_wrap.cxx ---- asc-2.5.0.0/source/lua/mapedcommands_wrap.cxx.lua-52 2012-05-19 11:30:39.000000000 -0400 -+++ asc-2.5.0.0/source/lua/mapedcommands_wrap.cxx 2013-05-10 11:28:30.558982275 -0400 -@@ -10,6 +10,13 @@ - - #define SWIGLUA - -+#ifndef lua_strlen -+#define lua_strlen(L,i) lua_rawlen(L, (i)) -+#endif -+ -+#ifndef lua_pushglobaltable -+#define lua_pushglobaltable(L) lua_pushvalue(L, LUA_GLOBALSINDEX) -+#endif - - #ifdef __cplusplus - /* SwigValueWrapper is described in swig.swg */ -@@ -6637,7 +6644,7 @@ fail: - } - #endif - --static const struct luaL_reg swig_commands[] = { -+static const struct luaL_Reg swig_commands[] = { - { "getActiveMap", _wrap_getActiveMap}, - { "repaintMap", _wrap_repaintMap}, - { "getObjectType", _wrap_getObjectType}, -@@ -7049,7 +7056,7 @@ SWIGEXPORT int SWIG_init(lua_State* L) - { - int i; - /* start with global table */ -- lua_pushvalue(L,LUA_GLOBALSINDEX); -+ lua_pushglobaltable(L); - /* SWIG's internal initalisation */ - SWIG_InitializeModule((void*)L); - SWIG_PropagateClientData(); diff --git a/asc.spec b/asc.spec index 529b653..b37cc0f 100644 --- a/asc.spec +++ b/asc.spec @@ -1,14 +1,12 @@ Name: asc -Version: 2.5.0.0 -Release: 6%{?dist} +Version: 2.6.0.0 +Release: 1%{?dist} Summary: Advanced Strategic Command Group: Amusements/Games License: GPLv2+ URL: http://www.asc-hq.org/ Source0: http://downloads.sourceforge.net/asc-hq/asc-%{version}.tar.bz2 Source1: %{name}.desktop -Patch0: asc-2.4.0.0-gcc47.patch -Patch1: asc-2.5.0.0-lua-5.2.patch BuildRequires: SDL_image-devel SDL_mixer-devel SDL_sound-devel BuildRequires: bzip2-devel libjpeg-devel libsigc++-devel physfs-devel BuildRequires: libvorbis-devel libpng-devel libtiff-devel boost-devel @@ -22,8 +20,6 @@ ASC is a free, turn based strategy game. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -b .lua-52 sed -i 's|$datadir/games/|$datadir/|g' configure sed -i 's|$(datadir)/games/|$(datadir)/|g' `find -name Makefile.in` chmod -x source/libs/paragui/include/paragui.h @@ -69,12 +65,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %doc README COPYING AUTHORS %{_bindir}/%{name}* %{_datadir}/%{name} +%{_datadir}/appdata %{_datadir}/applications/*%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man6/%{name}*.6.gz %changelog +* Sat Mar 08 2014 Hans de Goede - 2.6.0.0-1 +- New upstream version 2.6.0.0 (rhbz#1047182) + * Sat Aug 03 2013 Fedora Release Engineering - 2.5.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 496315d..2e97acc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93400834ef6b75343388c1edc772bef9 asc-2.5.0.0.tar.bz2 +3f0002f1d3ccdf447b4721a171ed2ac3 asc-2.6.0.0.tar.bz2