[nemiver] Fix build for GCC 4.5

[Dodji Seketeli]

commit 98f6c3bd456be90c685ddcc93d5cfd25560b04c0
Author: dodjirpm <dodjirpm at adjoa.(none)>
Date:   Thu Sep 23 15:26:41 2010 +0200

    Fix build for GCC 4.5

 0001-Fix-build-with-gcc-4.5.patch    |   27 +++++++++++++++++++++++++++
 0001-More-GCC-4.5-fixes-611588.patch |   27 +++++++++++++++++++++++++++
 nemiver.spec                         |   14 ++++++++++++--
 3 files changed, 66 insertions(+), 2 deletions(-)
---
diff --git a/0001-Fix-build-with-gcc-4.5.patch b/0001-Fix-build-with-gcc-4.5.patch
new file mode 100644
index 0000000..aed6399
--- /dev/null
+++ b/0001-Fix-build-with-gcc-4.5.patch
@@ -0,0 +1,27 @@
+From 9978746e91b8c6789d792bdc926306db0873c74c Mon Sep 17 00:00:00 2001
+From: Dodji Seketeli <dodji at redhat.com>
+Date: Sat, 27 Feb 2010 22:14:38 +0100
+Subject: [PATCH] Fix build with gcc 4.5
+
+	* src/common/nmv-object.cc: Class name is Object, not
+	Object::Object.
+---
+ src/common/nmv-object.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/common/nmv-object.cc b/src/common/nmv-object.cc
+index fc1f0d1..679b8ae 100644
+--- a/src/common/nmv-object.cc
++++ b/src/common/nmv-object.cc
+@@ -59,7 +59,7 @@ Object::Object (Object const &a_object):
+     *m_priv = *a_object.m_priv;
+ }
+ 
+-Object::Object&
++Object&
+ Object::operator= (Object const &a_object)
+ {
+     if (this == &a_object)
+-- 
+1.7.2.3
+
diff --git a/0001-More-GCC-4.5-fixes-611588.patch b/0001-More-GCC-4.5-fixes-611588.patch
new file mode 100644
index 0000000..a5f9e02
--- /dev/null
+++ b/0001-More-GCC-4.5-fixes-611588.patch
@@ -0,0 +1,27 @@
+From a68bad515e7e2780756b76d12f193f580d1e61f4 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dominique-gnomezilla at leuenberger.net>
+Date: Tue, 2 Mar 2010 18:39:00 +0100
+Subject: [PATCH] More GCC 4.5 fixes, #611588
+
+	* src/langs/nmv-cpp-ast.cc (Token::operator=): Token::Token is
+	the name of the constructor, not of the type.
+---
+ src/langs/nmv-cpp-ast.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/langs/nmv-cpp-ast.cc b/src/langs/nmv-cpp-ast.cc
+index fbbe559..9e17d1b 100644
+--- a/src/langs/nmv-cpp-ast.cc
++++ b/src/langs/nmv-cpp-ast.cc
+@@ -64,7 +64,7 @@ Token::Token (const Token &a_t)
+     m_int_value = a_t.get_int_value ();
+ }
+ 
+-Token::Token&
++Token&
+ Token::operator= (const Token &a_t)
+ {
+     m_kind = a_t.get_kind ();
+-- 
+1.7.2.3
+
diff --git a/nemiver.spec b/nemiver.spec
index 2c5a220..fda45db 100644
--- a/nemiver.spec
+++ b/nemiver.spec
@@ -1,13 +1,15 @@
 Name:		nemiver
 Version:	0.7.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A GNOME C/C++ Debugger
 
 Group:		Development/Debuggers
 License:	GPLv2+
 URL:		http://projects.gnome.org/nemiver
 
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.7/%{name}-%{version}.tar.bz2
+Patch0:		0001-Fix-build-with-gcc-4.5.patch
+Patch1:		0001-More-GCC-4.5-fixes-611588.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -67,6 +69,9 @@ The yelp package must be installed to make use of Nemiver's documentation.
 %prep
 %setup -q
 
+%patch0 -p1
+%patch1 -p1
+
 %build
 %configure --disable-static --disable-schemas-install		\
 	--disable-scrollkeeper
@@ -143,6 +148,11 @@ scrollkeeper-update -q ||:
 %{_mandir}/man?/%{name}.*
 
 %changelog
+* Thu Sep 23 2010  <dodji at seketeli.org> - 0.7.3-2
+- Fix source0 URL.
+- 0001-Fix-build-with-gcc-4.5.patch and 0001-More-GCC-4.5-fixes-611588.patch:
+  fix build breakage with GCC 4.5
+
 * Sun Dec 06 2009 Dodji Seketeli <dodji at redhat.com> - 0.7.3-1
 - Update to new upstream release (0.7.3)