[f-spot] - Rebuilt for Mono 2.8 - Add two upstream patches to fix compile issues with Mono 2.8

[chkr]

commit 8224187cd0ec6b137061cc505671c149ce3d68e7
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sun Oct 24 20:08:55 2010 +0200

    - Rebuilt for Mono 2.8
    - Add two upstream patches to fix compile issues with Mono 2.8

 ...of-a-struct-must-be-initialized-before-th.patch |   48 ++++++++++++++++++++
 ...r-from-gtk-sharp-master-does-not-have-a-C.patch |   26 +++++++++++
 f-spot.spec                                        |   15 ++++++-
 3 files changed, 88 insertions(+), 1 deletions(-)
---
diff --git a/0001-All-fields-of-a-struct-must-be-initialized-before-th.patch b/0001-All-fields-of-a-struct-must-be-initialized-before-th.patch
new file mode 100644
index 0000000..bbfb7f4
--- /dev/null
+++ b/0001-All-fields-of-a-struct-must-be-initialized-before-th.patch
@@ -0,0 +1,48 @@
+From 5b8a05f130d7e2bf6e284ae0486c9193112806fa Mon Sep 17 00:00:00 2001
+From: Marek Habersack <grendel at twistedcode.net>
+Date: Wed, 15 Sep 2010 23:18:08 +0200
+Subject: [PATCH] All fields of a struct must be initialized before the constructor returns
+
+https://bugzilla.gnome.org/show_bug.cgi?id=629222
+---
+ src/TagLib/IFD/Entries/Rational.cs  |    6 ++++--
+ src/TagLib/IFD/Entries/SRational.cs |    6 ++++--
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/TagLib/IFD/Entries/Rational.cs b/src/TagLib/IFD/Entries/Rational.cs
+index e8a69c5..2113a9a 100644
+--- a/src/TagLib/IFD/Entries/Rational.cs
++++ b/src/TagLib/IFD/Entries/Rational.cs
+@@ -62,8 +62,10 @@ namespace TagLib.IFD.Entries
+ 		/// </param>
+ 		public Rational (uint numerator, uint denominator)
+ 		{
+-			Numerator = numerator;
+-			Denominator = denominator;
++			if (denominator == 0)
++				throw new ArgumentException ("denominator");
++			this.numerator = numerator;
++			this.denominator = denominator;
+ 		}
+ 
+ #endregion
+diff --git a/src/TagLib/IFD/Entries/SRational.cs b/src/TagLib/IFD/Entries/SRational.cs
+index f80dee8..59ca58a 100644
+--- a/src/TagLib/IFD/Entries/SRational.cs
++++ b/src/TagLib/IFD/Entries/SRational.cs
+@@ -62,8 +62,10 @@ namespace TagLib.IFD.Entries
+ 		/// </param>
+ 		public SRational (int numerator, int denominator)
+ 		{
+-			Numerator = numerator;
+-			Denominator = denominator;
++			if (denominator == 0)
++				throw new ArgumentException ("denominator");
++			this.numerator = numerator;
++			this.denominator = denominator;
+ 		}
+ 
+ #endregion
+-- 
+1.7.2.3
+
diff --git a/0001-PixbufLoader-from-gtk-sharp-master-does-not-have-a-C.patch b/0001-PixbufLoader-from-gtk-sharp-master-does-not-have-a-C.patch
new file mode 100644
index 0000000..dfa84f7
--- /dev/null
+++ b/0001-PixbufLoader-from-gtk-sharp-master-does-not-have-a-C.patch
@@ -0,0 +1,26 @@
+From 9d6e8052b188c2b1cb310ef05842da74a730a39f Mon Sep 17 00:00:00 2001
+From: Marek Habersack <grendel at twistedcode.net>
+Date: Wed, 15 Sep 2010 23:21:52 +0200
+Subject: [PATCH] PixbufLoader from gtk-sharp/master does not have a Close () overload which takes a boolean parameter
+
+https://bugzilla.gnome.org/show_bug.cgi?id=629224
+---
+ .../MainApp/FSpot.Loaders/GdkImageLoader.cs        |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
+index 2eea50e..9c9c07a 100644
+--- a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
++++ b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
+@@ -132,7 +132,7 @@ namespace FSpot.Loaders {
+ 		public new bool Close ()
+ 		{
+ 			lock (sync_handle) {
+-				return base.Close (true);
++				return base.Close ();
+ 			}
+ 		}
+ #endregion
+-- 
+1.7.2.3
+
diff --git a/f-spot.spec b/f-spot.spec
index a2e8c31..1c8a502 100644
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.8.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -12,6 +12,11 @@ Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.8/f-spot-%{versi
 Patch1:         0001-Don-t-crash-with-empty-databases.patch
 # don't unmount cameras before importing
 Patch3:         0001-simplify-f-spot-import.patch
+# two upstream patches to fix compile issue with Mono 2.8:
+# http://gitorious.org/taglib-sharp/mainline/commit/5b8a05f130d7e2bf6e284ae0486c9193112806fa
+Patch4:         0001-All-fields-of-a-struct-must-be-initialized-before-th.patch
+# http://git.gnome.org/browse/f-spot/commit/?id=9d6e8052b188c2b1cb310ef05842da74a730a39f
+Patch5:         0001-PixbufLoader-from-gtk-sharp-master-does-not-have-a-C.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -77,6 +82,10 @@ photo collection in a slideshow as a screensaver.
 %setup -q
 %patch1 -p1 -b db-fix
 %patch3 -F 2 -p1 -b .gvfs-gphoto
+pushd lib/TagLib/TagLib
+%patch4 -p1 -b mono28-compile-fix
+popd
+%patch5 -p1 -b mono28-compile-fix
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -157,6 +166,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Sun Oct 24 2010 Christian Krause <chkr at fedoraproject.org> - 0.8.0-4
+- Rebuilt for Mono 2.8
+- Add two upstream patches to fix compile issues with Mono 2.8
+
 * Sun Oct 17 2010 Christian Krause <chkr at fedoraproject.org> - 0.8.0-3
 - Fix f-spot-import script (don't unmount gvfs mounts)