Author: jwrdegoede Update of /cvs/free/rpms/smc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv1506 Modified Files: smc.spec Added Files: smc-1.5-boost-1.36.patch Log Message: * Sun Aug 17 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.5-2 - Rebuild against boost 1.36 smc-1.5-boost-1.36.patch: --- NEW FILE smc-1.5-boost-1.36.patch --- diff -up smc-1.5/src/core/game_core.cpp~ smc-1.5/src/core/game_core.cpp --- smc-1.5/src/core/game_core.cpp~ 2008-08-17 09:59:13.000000000 +0200 +++ smc-1.5/src/core/game_core.cpp 2008-08-17 09:59:13.000000000 +0200 @@ -1544,29 +1544,29 @@ vector<string> Get_Directory_Files( stri if( fs::is_directory( *dir_itr ) ) { // ignore hidden directories - if( dir_itr->leaf().find( "." ) == 0 ) + if( dir_itr->path().leaf().find( "." ) == 0 ) { continue; } if( with_directories ) { - valid_files.push_back( dir + "/" + dir_itr->leaf() ); + valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); } // load all items from the sub-directory - vector<string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->leaf(), file_type, with_directories ); + vector<string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories ); valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() ); } // 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 ) { - valid_files.push_back( dir + "/" + dir_itr->leaf() ); + valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); } } catch( const std::exception &ex ) { - printf( "%s %s\n", dir_itr->leaf().c_str(), ex.what() ); + printf( "%s %s\n", dir_itr->path().leaf().c_str(), ex.what() ); } } diff -up smc-1.5/src/overworld/worlds.cpp~ smc-1.5/src/overworld/worlds.cpp --- smc-1.5/src/overworld/worlds.cpp~ 2008-08-17 10:04:55.000000000 +0200 +++ smc-1.5/src/overworld/worlds.cpp 2008-08-17 10:04:55.000000000 +0200 @@ -111,7 +111,7 @@ void cOverworld_Manager :: Load_Dir( str { try { - string current_dir = dir_itr->leaf(); + 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 } catch( const std::exception &ex ) { - printf( "%s %s\n", dir_itr->leaf().c_str(), ex.what() ); + printf( "%s %s\n", dir_itr->path().leaf().c_str(), ex.what() ); } } } Index: smc.spec =================================================================== RCS file: /cvs/free/rpms/smc/devel/smc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- smc.spec 24 Jul 2008 20:18:15 -0000 1.1 +++ smc.spec 17 Aug 2008 14:53:32 -0000 1.2 @@ -1,6 +1,6 @@ Name: smc Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 2D platform game that uses OpenGL in a style similar to Super Mario Group: Amusements/Games License: GPLv3 @@ -8,8 +8,8 @@ Source0: http://downloads.sourceforge.net/smclone/%{name}-%{version}.tar.bz2 Source1: smc.sh Source2: dochelper.pl +Patch0: smc-1.5-boost-1.36.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: automake BuildRequires: boost-devel >= 1.31 BuildRequires: cegui-devel >= 0.5 BuildRequires: libGLU-devel @@ -31,15 +31,13 @@ %prep %setup -q - +%patch0 -p1 # Delete useless files to avoid them being installed rm -f file data/pixmaps/world/tiles/green_1/todo.txt #Fix EOL chars sed -i 's/\r//' docs/style.css docs/*.html docs/*.txt -# ./autogen.sh - %build %configure @@ -115,6 +113,9 @@ %changelog +* Sun Aug 17 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.5-2 +- Rebuild against boost 1.36 + * Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.5-1 - New upstream release 1.5