From b8a5909b648ee971680d416d997187f7f2d2094c Mon Sep 17 00:00:00 2001
From: chkr <chkr@fedoraproject.org>
Date: Apr 05 2010 20:19:26 +0000
Subject: - Fix monodoc integration (#550144)


---

diff --git a/gtk-sharp2.spec b/gtk-sharp2.spec
index 000bf9f..ac49124 100644
--- a/gtk-sharp2.spec
+++ b/gtk-sharp2.spec
@@ -1,6 +1,6 @@
 Name:           gtk-sharp2
 Version:        2.12.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -9,7 +9,6 @@ URL:            http://www.mono-project.com/GtkSharp
 Source0:        http://ftp.novell.com/pub/mono/sources/gtk-sharp212/gtk-sharp-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         gtk-sharp2-2.10.3-libdir.patch
-Patch1:         gtksharp-2129-docfix.patch
 
 BuildRequires:  mono-devel gtk2-devel libglade2-devel
 BuildRequires:  automake, libtool
@@ -48,7 +47,8 @@ for writing gtk-sharp2 applications.
 %package doc
 Group:        Documentation
 Summary:      Gtk# documentation
-Requires: %{name} = %{version}-%{release}
+Requires:     %{name} = %{version}-%{release}
+Requires:     monodoc
 
 %description doc
 This package provides the Gtk# documentation for monodoc.
@@ -56,7 +56,6 @@ This package provides the Gtk# documentation for monodoc.
 %prep
 %setup -q -n gtk-sharp-%{version}
 %patch0 -p1 -b .libdir
-%patch1 -p1 -b .docfix
 
 # Fix assembly libdir
 sed -i 's|$(prefix)/lib|%{_libdir}|g' parser/Makefile.in \
@@ -81,10 +80,6 @@ make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp-2.0 /gacd
 #Remove libtool archive
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.*a
 
-install -d $RPM_BUILD_ROOT%{_libdir}/monodoc/sources/
-install -m 755 doc/gtk-sharp-docs.source $RPM_BUILD_ROOT%{_libdir}/monodoc/sources/
-cp -R doc/en $RPM_BUILD_ROOT%{_libdir}/monodoc/sources/gtk-sharp-docs
-
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -119,9 +114,12 @@ cp -R doc/en $RPM_BUILD_ROOT%{_libdir}/monodoc/sources/gtk-sharp-docs
 
 %files doc
 %defattr(-,root,root,-)
-%{_libdir}/monodoc
+%{_libdir}/monodoc/sources/*
 
 %changelog
+* Mon Apr 05 2010 Christian Krause <chkr@fedoraproject.org> - 2.12.10-2
+- Fix monodoc integration (#550144)
+
 * Fri Apr 02 2010 Christian Krause <chkr@fedoraproject.org> - 2.12.10-1
 - Update to new upstream version
 - Minor spec file cleanup
diff --git a/gtksharp-2129-docfix.patch b/gtksharp-2129-docfix.patch
deleted file mode 100644
index 1a27907..0000000
--- a/gtksharp-2129-docfix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- gtk-sharp-2.12.9/doc/gtk-sharp-docs.source	2009-01-07 20:49:44.000000000 +0000
-+++ gtk-sharp-2.12.9/doc/gtk-sharp-docs-new.source	2009-09-09 23:08:49.000000000 +0100
-@@ -1,5 +1,5 @@
- <?xml version="1.0"?>
- <monodoc>
-   <node label="Gnome Libraries" name="classlib-gnome" parent="libraries" />
--  <source provider="ecma" basefile="gtk-sharp-docs" path="classlib-gnome"/>
-+  <source provider="ecma-uncompiled" basefile="gtk-sharp-docs" path="classlib-gnome"/>
- </monodoc>
---- gtk-sharp-2.12.9/doc/en/index.xml	2009-05-26 19:13:15.000000000 +0100
-+++ gtk-sharp-2.12.9/doc/en/index-new.xml	2009-09-09 23:07:47.000000000 +0100
-@@ -1238,9 +1238,6 @@
-       <Type Name="MimeEquivalence" />
-       <Type Name="ModuleCallbackFullAuthenticationOutFlags" />
-     </Namespace>
--    <Namespace Name="GtkSharp.GnomeVfsSharp">
--      <Type Name="ObjectManager" />
--    </Namespace>
-     <Namespace Name="Art">
-       <Type Name="Affine" />
-       <Type Name="AlphaGamma" />
-@@ -1470,9 +1467,6 @@
-       <Type Name="Authentication" />
-       <Type Name="PrintSvg" />
-     </Namespace>
--    <Namespace Name="GtkSharp.GnomeSharp">
--      <Type Name="ObjectManager" />
--    </Namespace>
-     <Namespace Name="GConf">
-       <Type Name="ClientBase" />
-       <Type Name="Client" />