rpms/gtk-sharp2/F-12 gtk-sharp2.spec, 1.47, 1.48 gtksharp-2129-docfix.patch, 1.1, NONE

[chkr]

Author: chkr

Update of /cvs/pkgs/rpms/gtk-sharp2/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4897

Modified Files:
	gtk-sharp2.spec 
Removed Files:
	gtksharp-2129-docfix.patch 
Log Message:
* Mon Apr 05 2010 Christian Krause <chkr at fedoraproject.org> - 2.12.10-2
- Fix monodoc integration (#550144)
- Add missing BR monodoc



Index: gtk-sharp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp2/F-12/gtk-sharp2.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- gtk-sharp2.spec	5 Apr 2010 19:17:54 -0000	1.47
+++ gtk-sharp2.spec	5 Apr 2010 21:40:40 -0000	1.48
@@ -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,9 +9,8 @@ URL:            http://www.mono-project.
 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:  mono-devel gtk2-devel libglade2-devel monodoc
 BuildRequires:  automake, libtool
 
 # Mono only available on these:
@@ -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# documenta
 %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 GAC
 #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,13 @@ cp -R doc/en $RPM_BUILD_ROOT%{_libdir}/m
 
 %files doc
 %defattr(-,root,root,-)
-%{_libdir}/monodoc
+%{_libdir}/monodoc/sources/*
 
 %changelog
+* Mon Apr 05 2010 Christian Krause <chkr at fedoraproject.org> - 2.12.10-2
+- Fix monodoc integration (#550144)
+- Add missing BR monodoc
+
 * Fri Apr 02 2010 Christian Krause <chkr at fedoraproject.org> - 2.12.10-1
 - Update to new upstream version
 - Minor spec file cleanup


--- gtksharp-2129-docfix.patch DELETED ---