[gnome-sharp] Rebuild against mono-2.8 Alter mono.cairo export Remove mono.getoptions test (samples/gnomevfs) - go

[Paul F. Johnson]

commit 16f088fd9d7bab58724a66a28c14ff2ce55faaf2
Author: Paul F. Johnson <paul at all-the-johnsons.co.uk>
Date:   Wed Oct 13 00:44:38 2010 +0100

    Rebuild against mono-2.8
    Alter mono.cairo export
    Remove mono.getoptions test (samples/gnomevfs) - gone in 2.8

 .gitignore                             |    1 +
 gnome-sharp-2.15.0-libdir.patch        |   89 ---------------------------
 gnome-sharp-2.16.0-automake-1.10.patch |   11 ---
 gnome-sharp-2.16.0-gtkhtml3-3.14.patch |   27 --------
 gnome-sharp-2.16.1-assemblydir.patch   |   66 --------------------
 gnome-sharp-2241-getopts.patch         |   33 ++++++++++
 gnome-sharp-libdir.patch               |  105 --------------------------------
 gnome-sharp.spec                       |   13 +++-
 8 files changed, 44 insertions(+), 301 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 441b9c9..5e6249f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gnome-sharp-2.24.1.tar.bz2
+/gnome-sharp-2.24.1.tar.bz2
diff --git a/gnome-sharp-2241-getopts.patch b/gnome-sharp-2241-getopts.patch
new file mode 100644
index 0000000..09cd785
--- /dev/null
+++ b/gnome-sharp-2241-getopts.patch
@@ -0,0 +1,33 @@
+--- gnome-sharp-2.24.1/sample/gnomevfs/Makefile.in	2009-03-03 16:09:52.000000000 +0000
++++ gnome-sharp-2.24.1/sample/gnomevfs/Makefile-new.in	2010-10-09 13:45:34.566816490 +0100
+@@ -446,8 +446,6 @@
+ TestVolumes.exe: $(srcdir)/TestVolumes.cs $(assemblies)
+ 	$(CSC) /out:TestVolumes.exe $(references) $(srcdir)/TestVolumes.cs
+ 
+-TestXfer.exe: $(srcdir)/TestXfer.cs $(assemblies)
+-	$(CSC) /out:TestXfer.exe $(references) -r:Mono.GetOptions.dll $(srcdir)/TestXfer.cs
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- gnome-sharp-2.24.1/sample/gnomevfs/Makefile.am	2008-03-07 02:32:14.000000000 +0000
++++ gnome-sharp-2.24.1/sample/gnomevfs/Makefile-new.am	2010-10-09 13:48:30.040219839 +0100
+@@ -13,13 +13,6 @@
+ 	TestSyncWrite.exe	\
+ 	TestUnlink.exe		\
+ 	TestVolumes.exe
+-
+-if ENABLE_MONOGETOPTIONS
+-EXTRA_TARGETS = TestXfer.exe
+-else
+-EXTRA_TARGETS =
+-endif
+-
+ else
+ TARGETS =
+ EXTRA_TARGETS =
+@@ -86,5 +79,3 @@
+ TestVolumes.exe: $(srcdir)/TestVolumes.cs $(assemblies)
+ 	$(CSC) /out:TestVolumes.exe $(references) $(srcdir)/TestVolumes.cs
+ 
+-TestXfer.exe: $(srcdir)/TestXfer.cs $(assemblies)
+-	$(CSC) /out:TestXfer.exe $(references) -r:Mono.GetOptions.dll $(srcdir)/TestXfer.cs
diff --git a/gnome-sharp.spec b/gnome-sharp.spec
index acc6074..e04feec 100644
--- a/gnome-sharp.spec
+++ b/gnome-sharp.spec
@@ -1,6 +1,6 @@
 Name:           gnome-sharp
 Version:        2.24.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@ Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/gnome-sha
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: %{name}-2.20.0-libdir.patch
+Patch0: %{name}-2241-getopts.patch
 # init gtype before using gconf
 Patch2: gnome-sharp-gconf-init.patch
 
@@ -41,15 +42,16 @@ for writing gnome-sharp2 applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .getopts
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .gconf-init
 
 %build
 autoreconf --force --install
 aclocal
-
+#sed -i -e 's!-r:Mono.GetOptions.dll! !' sample/gnomevfs/Makefile.in
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-export MONO_CAIRO_LIBS="-r:%{_libdir}/mono/1.0/Mono.Cairo.dll"
+export MONO_CAIRO_LIBS="-r:%{_libdir}/mono/2.0/Mono.Cairo.dll"
 %configure
 make
 
@@ -81,6 +83,11 @@ make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp-2.0 /gacd
 %{_libdir}/pkgconfig/gconf-sharp-peditors-2.0.pc
 
 %changelog
+* Sat Oct 09 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.24.1-2
+- Rebuild
+- Alter mono-cairo export position
+- Add Mono.GetOptions patch (gone in Mono 2.8)
+
 * Wed Jun 23 2010 Christian Krause <chkr at fedoraproject.org> - 2.24.1-1
 - Update to most recent upstream version 2.24.1
 - Cleanup spec file