[blobby] 1.0rc1 and fix FTBFS

[Tom Callaway]

commit 779aef6aef9a94798fdfe98ca6a29992be342058
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Wed Mar 21 16:01:23 2012 -0400

    1.0rc1 and fix FTBFS

 .gitignore                |    1 +
 blobby-1.0rc1-gcc47.patch |   67 +++++++++++++++++++++++++++++++++++++++++++++
 blobby.spec               |   24 +++++++---------
 sources                   |    2 +-
 4 files changed, 80 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8fa0706..fddad0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 blobby2-linux-0.9b.tar.gz
 /blobby2-linux-0.9c.tar.bz2
 /blobby2-linux-0.9c.tar.gz
+/blobby2-linux-1.0rc1.tar.gz
diff --git a/blobby-1.0rc1-gcc47.patch b/blobby-1.0rc1-gcc47.patch
new file mode 100644
index 0000000..11a05c0
--- /dev/null
+++ b/blobby-1.0rc1-gcc47.patch
@@ -0,0 +1,67 @@
+diff -up blobby-1.0rc1/src/raknet/BinarySearchTree.h.gcc47 blobby-1.0rc1/src/raknet/BinarySearchTree.h
+--- blobby-1.0rc1/src/raknet/BinarySearchTree.h.gcc47	2012-02-12 13:25:48.000000000 -0500
++++ blobby-1.0rc1/src/raknet/BinarySearchTree.h	2012-03-21 15:58:20.915860789 -0400
+@@ -338,12 +338,12 @@ namespace BasicDataStructures
+ 			if ( current->left == 0 )
+ 				left_height = 0;
+ 			else
+-				left_height = height( current->left );
++				left_height = this->height( current->left );
+ 				
+ 			if ( current->right == 0 )
+ 				right_height = 0;
+ 			else
+-				right_height = height( current->right );
++				right_height = this->height( current->right );
+ 				
+ 			if ( right_height - left_height == 2 )
+ 			{
+@@ -371,7 +371,7 @@ namespace BasicDataStructures
+ 			if ( current == this->root )
+ 				break;
+ 				
+-			current = find_parent( *( current->item ) );
++			current = this->find_parent( *( current->item ) );
+ 			
+ 		}
+ 	}
+@@ -400,7 +400,7 @@ namespace BasicDataStructures
+ 		if ( A == 0 )
+ 			return false;
+ 			
+-		return height( A->right ) > height( A->left );
++		return this->height( A->right ) > this->height( A->left );
+ 	}
+ 	
+ 	template <class BinarySearchTreeType>
+@@ -409,7 +409,7 @@ namespace BasicDataStructures
+ 		if ( A == 0 )
+ 			return false;
+ 			
+-		return height( A->left ) > height( A->right );
++		return this->height( A->left ) > this->height( A->right );
+ 	}
+ 	
+ 	template <class BinarySearchTreeType>
+@@ -446,8 +446,8 @@ namespace BasicDataStructures
+ 		
+ 		*/
+ 		
+-		B = find_parent( *( C->item ) );
+-		A = find_parent( *( B->item ) );
++		B = this->find_parent( *( C->item ) );
++		A = this->find_parent( *( B->item ) );
+ 		D = C->right;
+ 		
+ 		if ( A )
+@@ -510,8 +510,8 @@ namespace BasicDataStructures
+ 		
+ 		*/
+ 		
+-		B = find_parent( *( C->item ) );
+-		A = find_parent( *( B->item ) );
++		B = this->find_parent( *( C->item ) );
++		A = this->find_parent( *( B->item ) );
+ 		D = C->left;
+ 		
+ 		if ( A )
diff --git a/blobby.spec b/blobby.spec
index 880b771..46f77b9 100644
--- a/blobby.spec
+++ b/blobby.spec
@@ -1,15 +1,15 @@
+%global prerel rc1
+
 Name:           blobby
-Version:        0.9c
-Release:        3%{?dist}
+Version:        1.0
+Release:        0.1.%{prerel}%{?dist}
 Summary:        Volley-ball game
-
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://blobby.sourceforge.net
-
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}2-linux-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}2-linux-%{version}%{prerel}.tar.gz
 Source1:        blobby.desktop
-
+Patch0:         blobby-1.0rc1-gcc47.patch
 BuildRequires:  SDL-devel, physfs-devel, zlib-devel, cmake, boost-devel, zip
 BuildRequires:  ImageMagick, desktop-file-utils, hicolor-icon-theme
 
@@ -17,21 +17,17 @@ BuildRequires:  ImageMagick, desktop-file-utils, hicolor-icon-theme
 Blobby Volley is one of the most popular freeware games.
 Blobby Volley 2 is the continuation of this lovely game.
 
-
 %prep
-%setup -q -n %{name}-beta-%{version}
+%setup -q -n %{name}-%{version}%{prerel}
+%patch0 -p1 -b .gcc47
 
 %build
 %cmake .
 make %{?_smp_mflags}
 
-
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%check
-#ctest
-
 # Icon
 unzip -o -j data/gfx.zip gfx/ball01.bmp
 convert -size 48x48 -transparent black ball01.bmp blobby.png
@@ -59,8 +55,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 %{_datadir}/applications/*.desktop
 
-
 %changelog
+* Wed Mar 21 2012 Tom Callaway <spot at fedoraproject.org> - 1.0-0.1.rc1
+- update to 1.0rc1
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9c-3
 - Rebuilt for c++ ABI breakage
 
diff --git a/sources b/sources
index 6da7f52..e40d7bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d3a6d185c4acd1c5eddf0ce46b3f55bb  blobby2-linux-0.9c.tar.gz
+f56472cee041ef3d3c7def604e71b248  blobby2-linux-1.0rc1.tar.gz