Author: jwrdegoede Update of /cvs/free/rpms/smc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20814 Modified Files: .cvsignore smc-1.5-boost-1.36.patch smc.spec sources Log Message: * Sat Apr 11 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.8-1 - New upstream release 1.8 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/smc/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Jan 2009 08:21:00 -0000 1.3 +++ .cvsignore 15 Apr 2009 09:16:03 -0000 1.4 @@ -1 +1 @@ -smc-1.7.tar.bz2 +smc-1.8.tar.bz2 smc-1.5-boost-1.36.patch: Index: smc-1.5-boost-1.36.patch =================================================================== RCS file: /cvs/free/rpms/smc/devel/smc-1.5-boost-1.36.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- smc-1.5-boost-1.36.patch 2 Jan 2009 08:21:00 -0000 1.2 +++ smc-1.5-boost-1.36.patch 15 Apr 2009 09:16:03 -0000 1.3 @@ -1,7 +1,7 @@ -diff -up smc-1.7/src/core/game_core.cpp~ smc-1.7/src/core/game_core.cpp ---- smc-1.7/src/core/game_core.cpp~ 2009-01-01 15:11:05.000000000 +0100 -+++ smc-1.7/src/core/game_core.cpp 2009-01-01 15:11:05.000000000 +0100 -@@ -1591,32 +1591,32 @@ vector<std::string> Get_Directory_Files( +diff -up smc-1.8/src/core/game_core.cpp.orig smc-1.8/src/core/game_core.cpp +--- smc-1.8/src/core/game_core.cpp.orig 2009-04-08 07:48:08.000000000 +0200 ++++ smc-1.8/src/core/game_core.cpp 2009-04-11 09:31:59.000000000 +0200 +@@ -1632,32 +1632,32 @@ vector<std::string> Get_Directory_Files( if( fs::is_directory( *dir_itr ) ) { // ignore hidden directories @@ -26,8 +26,8 @@ } } // valid file -- else if( file_type.empty() || dir_itr->leaf().rfind( file_type ) != string::npos ) -+ else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != string::npos ) +- else if( file_type.empty() || dir_itr->leaf().rfind( file_type ) != std::string::npos ) ++ else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos ) { - valid_files.push_back( dir + "/" + dir_itr->leaf() ); + valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); @@ -40,19 +40,19 @@ } } -diff -up smc-1.7/src/overworld/world_manager.cpp~ smc-1.7/src/overworld/world_manager.cpp ---- smc-1.7/src/overworld/world_manager.cpp~ 2009-01-01 15:11:31.000000000 +0100 -+++ smc-1.7/src/overworld/world_manager.cpp 2009-01-01 15:11:31.000000000 +0100 -@@ -111,7 +111,7 @@ void cOverworld_Manager :: Load_Dir( str +diff -up smc-1.8/src/overworld/world_manager.cpp.orig smc-1.8/src/overworld/world_manager.cpp +--- smc-1.8/src/overworld/world_manager.cpp.orig 2009-02-18 05:10:12.000000000 +0100 ++++ smc-1.8/src/overworld/world_manager.cpp 2009-04-11 09:31:34.000000000 +0200 +@@ -116,7 +116,7 @@ void cOverworld_Manager :: Load_Dir( con { try { -- string current_dir = dir_itr->leaf(); -+ string current_dir = dir_itr->path().leaf(); +- std::string current_dir = dir_itr->leaf(); ++ std::string current_dir = dir_itr->path().leaf(); // only directories with an existing description if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) ) -@@ -138,7 +138,7 @@ void cOverworld_Manager :: Load_Dir( str +@@ -143,7 +143,7 @@ void cOverworld_Manager :: Load_Dir( con } catch( const std::exception &ex ) { Index: smc.spec =================================================================== RCS file: /cvs/free/rpms/smc/devel/smc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- smc.spec 29 Mar 2009 14:06:02 -0000 1.6 +++ smc.spec 15 Apr 2009 09:16:03 -0000 1.7 @@ -1,6 +1,6 @@ Name: smc -Version: 1.7 -Release: 2%{?dist} +Version: 1.8 +Release: 1%{?dist} Summary: 2D platform game that uses OpenGL in a style similar to Super Mario Group: Amusements/Games License: GPLv3 @@ -109,6 +109,9 @@ %changelog +* Sat Apr 11 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.8-1 +- New upstream release 1.8 + * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.7-2 - rebuild for new F11 features Index: sources =================================================================== RCS file: /cvs/free/rpms/smc/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Jan 2009 08:21:00 -0000 1.3 +++ sources 15 Apr 2009 09:16:03 -0000 1.4 @@ -1 +1 @@ -6f924e55f55c151621ca9f921eee8e5a smc-1.7.tar.bz2 +448efe236ae6031dcf08761496d469ad smc-1.8.tar.bz2