rpms/auriferous/devel auriferous-1.0.1-silence-looping-warn.patch, NONE, 1.1 auriferous-1.0.1-fixes.patch, 1.2, 1.3 auriferous.desktop, 1.2, 1.3 auriferous.spec, 1.9, 1.10

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/auriferous/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv725

Modified Files:
	auriferous-1.0.1-fixes.patch auriferous.desktop 
	auriferous.spec 
Added Files:
	auriferous-1.0.1-silence-looping-warn.patch 
Log Message:
* Sun Nov 29 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-10
- Fix levels not loading
- Fix getting stuck at top of ladder below bar (in level 2)
- Add support for several non alpha numeric keys in key bindings dialog
- Silence ClanLib warning about sound stream looping not being implemented
- Fix crash on exit (real fix is in ClanLib06, #542178)


auriferous-1.0.1-silence-looping-warn.patch:
 resources.cpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE auriferous-1.0.1-silence-looping-warn.patch ---
diff -up auriferous-1.0.1/auriferous/resources.cpp~ auriferous-1.0.1/auriferous/resources.cpp
--- auriferous-1.0.1/auriferous/resources.cpp~	2002-05-30 15:23:11.000000000 +0200
+++ auriferous-1.0.1/auriferous/resources.cpp	2009-12-01 11:54:56.000000000 +0100
@@ -489,7 +489,7 @@ CL_SoundBuffer_Session* Resources::Jungl
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/jungle.ogg", res), true);
     jungle = new CL_SoundBuffer_Session(sample->prepare());
-    jungle->set_looping(true);
+    //jungle->set_looping(true);
   }
 	return jungle;
 }
@@ -499,7 +499,7 @@ CL_SoundBuffer_Session* Resources::Tech(
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/tech.ogg", res), true);
     tech = new CL_SoundBuffer_Session(sample->prepare());
-    tech->set_looping(true);
+    //tech->set_looping(true);
   }
 	return tech;
 }
@@ -509,7 +509,7 @@ CL_SoundBuffer_Session* Resources::Lava(
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/lava.ogg", res), true);
     lava = new CL_SoundBuffer_Session(sample->prepare());
-    lava->set_looping(true);
+    //lava->set_looping(true);
   }
 	return lava;
 }
@@ -519,7 +519,7 @@ CL_SoundBuffer_Session* Resources::Ice()
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/ice.ogg", res), true);
     ice = new CL_SoundBuffer_Session(sample->prepare());
-    ice->set_looping(true);
+    //ice->set_looping(true);
   }
 	return ice;
 }
@@ -529,7 +529,7 @@ CL_SoundBuffer_Session* Resources::Aqua(
 	{
     CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/aqua.ogg", res), true);
     aqua = new CL_SoundBuffer_Session(sample->prepare());
-    aqua->set_looping(true);
+    //aqua->set_looping(true);
   }
 	return aqua;
 }

auriferous-1.0.1-fixes.patch:
 auriferous-1.0.1/auriferous/auriferous.cpp |    6 ++-
 auriferous-1.0.1/auriferous/config.cpp     |    4 +-
 auriferous-1.0.1/auriferous/editor.cpp     |    5 ++
 auriferous-1.0.1/auriferous/game.cpp       |    5 ++
 auriferous-1.0.1/auriferous/game.h         |    4 ++
 auriferous-1.0.1/auriferous/global_types.h |    1 
 auriferous-1.0.1/auriferous/mainscreen.cpp |   50 +++++++++++++++++++----------
 auriferous-1.0.1/auriferous/map.cpp        |   18 +++++-----
 auriferous-1.0.1/auriferous/map_sample.cpp |   32 +++++++++++-------
 auriferous-1.0.1/auriferous/menu.cpp       |   13 ++++---
 auriferous-1.0.1/auriferous/monk_ai.cpp    |    6 +--
 auriferous-1.0.1/auriferous/resources.scr  |   10 ++---
 auriferous-1.0.1/auriferous/submenu.cpp    |    8 ++--
 auriferous-1.0.1/auriferous/submenu.h      |    2 -
 auriferous/player.cpp                      |    3 +
 15 files changed, 107 insertions(+), 60 deletions(-)

Index: auriferous-1.0.1-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/auriferous/devel/auriferous-1.0.1-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- auriferous-1.0.1-fixes.patch	30 Nov 2009 19:12:13 -0000	1.2
+++ auriferous-1.0.1-fixes.patch	1 Dec 2009 10:55:03 -0000	1.3
@@ -448,3 +448,15 @@ diff -ur auriferous-1.0.1.orig/auriferou
  
  		if(!in.eof())
  		{
+--- auriferous-1.0.1/auriferous/player.cpp	2002-05-30 18:38:35.000000000 +0200
++++ auriferous-1.0.1.new/auriferous/player.cpp	2009-11-30 23:52:58.000000000 +0100
+@@ -344,7 +346,8 @@
+ 			if(sample->map->get_maptile(map_x(16), map_y(16))->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y(16)+32)->get_type()==LADDER)
+ 			y=sample->map->get_maptile(map_x(16), map_y(16))->get_y();
+ 		}
+-		else if(dir!=STOPPED && controller->is_up() && (sample->map->get_maptile(map_x(16), map_y()+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y())->get_type()==LADDER) && !sample->map->get_maptile(map_x(16), map_y())->is_blocking())
++		else if(dir!=STOPPED && controller->is_up() && (sample->map->get_maptile(map_x(16), map_y()+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y())->get_type()==LADDER) && !sample->map->get_maptile(map_x(16), map_y())->is_blocking() &&
++		        (sample->map->get_maptile(map_x(16), map_y(-speed*timer->time_elapsed())+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y(-speed*timer->time_elapsed()))->get_type()==LADDER))
+ 		{
+ 			x=sample->map->get_maptile(map_x(16), map_y(16))->get_x();
+ 			sprite->set_new(0.2f, 22, 27);


Index: auriferous.desktop
===================================================================
RCS file: /cvs/extras/rpms/auriferous/devel/auriferous.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- auriferous.desktop	5 Aug 2007 18:36:27 -0000	1.2
+++ auriferous.desktop	1 Dec 2009 10:55:03 -0000	1.3
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Auriferous
 Comment=Game inspired by the classic Loderunner
 Exec=auriferous
-Icon=auriferous.png
+Icon=auriferous
 Terminal=false
 StartupNotify=false
 Type=Application


Index: auriferous.spec
===================================================================
RCS file: /cvs/extras/rpms/auriferous/devel/auriferous.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- auriferous.spec	30 Nov 2009 19:12:13 -0000	1.9
+++ auriferous.spec	1 Dec 2009 10:55:03 -0000	1.10
@@ -16,8 +16,10 @@ Source2:        auriferous.desktop
 Patch0:         auriferous-1.0.1-fixes.patch
 Patch1:         auriferous-1.0.1-destdir.patch
 Patch2:         auriferous-1.0.1-extra-keys.patch
+Patch3:         auriferous-1.0.1-silence-looping-warn.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ClanLib06-devel ImageMagick desktop-file-utils
+BuildRequires:  ClanLib06-devel >= ClanLib06-0.6.5-16, desktop-file-utils
+Requires:       hicolor-icon-theme
 
 %description
 An arcade style like game. The goal is to fight out all gold from the caves and
@@ -35,8 +37,9 @@ display cannot handle this you are out o
 %patch0 -p1 -z .fix
 %patch1 -p1 -z .destdir
 %patch2 -p1 -z .keys
+%patch3 -p1
 touch -r configure.in auriferous/Makefile.am
-cp %{SOURCE1} auriferous/pics/game
+cp -a %{SOURCE1} auriferous/pics/game
 
 
 %build
@@ -67,17 +70,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -91,7 +94,10 @@ fi
 %changelog
 * Sun Nov 29 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-10
 - Fix levels not loading
+- Fix getting stuck at top of ladder below bar (in level 2)
 - Add support for several non alpha numeric keys in key bindings dialog
+- Silence ClanLib warning about sound stream looping not being implemented
+- Fix crash on exit (real fix is in ClanLib06, #542178)
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild