[fbreader] Fix for compiling with GCC 4.5.0 -- upstreamed

[Michel Alexandre Salim]

commit 829ea520ab49680b19f7251c03b76916c6033148
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Sep 19 09:09:13 2010 +0200

    Fix for compiling with GCC 4.5.0 -- upstreamed

 fbreader-0.12.10-gcc45.patch |   11 +++++++++++
 fbreader.spec                |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/fbreader-0.12.10-gcc45.patch b/fbreader-0.12.10-gcc45.patch
new file mode 100644
index 0000000..d1b81b8
--- /dev/null
+++ b/fbreader-0.12.10-gcc45.patch
@@ -0,0 +1,11 @@
+--- fbreader-0.12.10/fbreader/src/library/Library.cpp.gcc45	2010-04-01 15:14:24.000000000 +0200
++++ fbreader-0.12.10/fbreader/src/library/Library.cpp	2010-09-19 08:35:02.027228139 +0200
+@@ -39,7 +39,7 @@
+ shared_ptr<Library> Library::ourInstance;
+ const size_t Library::MaxRecentListSize = 10;
+ 
+-Library::Library &Library::Instance() {
++Library &Library::Instance() {
+ 	if (ourInstance.isNull()) {
+ 		ourInstance = new Library();
+ 	}
diff --git a/fbreader.spec b/fbreader.spec
index 521d82c..496b449 100644
--- a/fbreader.spec
+++ b/fbreader.spec
@@ -1,6 +1,6 @@
 Name:           fbreader
 Version:        0.12.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        E-book reader
 
 Group:          Applications/Publishing
@@ -13,6 +13,9 @@ Patch1:         fbreader-optflags.patch
 # Use to expose the compiler flags used during build
 # Patch2:         fbreader-debug.patch
 Patch3:         fbreader-defaults.patch
+# constructor used as class name
+# http://fbreader.org/mantis/view.php?id=384
+Patch4:         fbreader-0.12.10-gcc45.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel bzip2-devel liblinebreak-devel
@@ -129,6 +132,7 @@ This package provides a Qt4-based UI for ZLibrary.
 %patch1 -p0 -b .optflags
 #%patch2 -p0 -b .debug
 %patch3 -p0 -b .defaults
+%patch4 -p1 -b .gcc45
 cp -p %{SOURCE1} .
 
 
@@ -244,6 +248,9 @@ exit 0
 
 
 %changelog
+* Sun Sep 19 2010 Michel Salim <salimma at fedoraproject.org> - 0.12.10-2
+- Fix for compiling under GCC 4.5 (filed upstream, #384)
+
 * Mon Jun  7 2010 Michel Salim <salimma at fedoraproject.org> - 0.12.10-1
 - Update to 0.12.10