8:21 a.m.
Author: jwrdegoede
Update of /cvs/free/rpms/smc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10029
Modified Files:
.cvsignore smc-1.5-boost-1.36.patch smc.spec sources
Log Message:
* Thu Jan 1 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.7-1
- New upstream release 1.7
- Rebuild for new boost
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 24 Jul 2008 20:18:15 -0000 1.2
+++ .cvsignore 2 Jan 2009 08:21:00 -0000 1.3
@@ -1 +1 @@
-smc-1.5.tar.bz2
+smc-1.7.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smc-1.5-boost-1.36.patch 17 Aug 2008 14:53:32 -0000 1.1
+++ smc-1.5-boost-1.36.patch 2 Jan 2009 08:21:00 -0000 1.2
@@ -1,7 +1,7 @@
-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
+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(
if( fs::is_directory( *dir_itr ) )
{
// ignore hidden directories
@@ -18,9 +18,12 @@
}
// 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() );
+ if( search_in_sub_directories )
+ {
+- vector<std::string> new_valid_files = Get_Directory_Files( dir +
"/" + dir_itr->leaf(), file_type, with_directories );
++ vector<std::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
)
@@ -37,9 +40,9 @@
}
}
-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
+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
{
try
Index: smc.spec
===================================================================
RCS file: /cvs/free/rpms/smc/devel/smc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- smc.spec 3 Dec 2008 13:12:59 -0000 1.4
+++ smc.spec 2 Jan 2009 08:21:00 -0000 1.5
@@ -1,6 +1,6 @@
Name: smc
-Version: 1.5
-Release: 4%{?dist}
+Version: 1.7
+Release: 1%{?dist}
Summary: 2D platform game that uses OpenGL in a style similar to Super Mario
Group: Amusements/Games
License: GPLv3
@@ -31,10 +31,7 @@
%prep
%setup -q
-#patch0 -p1
-# Delete useless files to avoid them being installed
-rm -f file data/pixmaps/world/tiles/green_1/todo.txt
-
+%patch0 -p1
#Fix EOL chars
sed -i 's/\r//' docs/style.css docs/*.html docs/*.txt
@@ -103,16 +100,19 @@
%files
%defattr(-,root,root,-)
+%doc credits.txt docs/*.html docs/*.txt docs/style.css
%{_bindir}/%{name}
%{_bindir}/%{name}.bin
%{_datadir}/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%doc credits.txt docs/*.html docs/license.txt docs/SMC.txt docs/style.css
-%doc docs/todo*
%changelog
+* Thu Jan 1 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.7-1
+- New upstream release 1.7
+- Rebuild for new boost
+
* Wed Dec 3 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.5-4
- Rebuild for new cegui
Index: sources
===================================================================
RCS file: /cvs/free/rpms/smc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 24 Jul 2008 20:18:15 -0000 1.2
+++ sources 2 Jan 2009 08:21:00 -0000 1.3
@@ -1 +1 @@
-72d10648435c349988dcd053e5fe64fe smc-1.5.tar.bz2
+6f924e55f55c151621ca9f921eee8e5a smc-1.7.tar.bz2