rpms/gtk-sharp/devel gtk-sharp-1.0.10-gtkhtml-3.24.0.patch, NONE, 1.1 gtk-sharp.spec, 1.10, 1.11

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/gtk-sharp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15482

Modified Files:
	gtk-sharp.spec 
Added Files:
	gtk-sharp-1.0.10-gtkhtml-3.24.0.patch 
Log Message:
missing BR, fix gtkhtml

gtk-sharp-1.0.10-gtkhtml-3.24.0.patch:

--- NEW FILE gtk-sharp-1.0.10-gtkhtml-3.24.0.patch ---
diff -up gtk-sharp-1.0.10/configure.in.BAD gtk-sharp-1.0.10/configure.in
--- gtk-sharp-1.0.10/configure.in.BAD	2008-10-27 16:21:26.000000000 -0400
+++ gtk-sharp-1.0.10/configure.in	2008-10-27 16:22:21.000000000 -0400
@@ -143,6 +143,12 @@ fi
 RSVG_REQUIRED_VERSION=2.0.1
 PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no)
 
+GTKHTML_REQUIRED_VERSION=3.24.0
+PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.14 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
+if test "x$enable_gtkhtml" = "xyes"; then
+GTKHTML_VERSION=3.24
+GTKHTML_SOVERSION=18
+else
 GTKHTML_REQUIRED_VERSION=3.6.0
 PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.6 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
 if test "x$enable_gtkhtml" = "xyes"; then
@@ -173,6 +179,7 @@ fi
 fi
 fi
 fi
+fi
 AC_SUBST(GTKHTML_VERSION)
 AC_SUBST(GTKHTML_SOVERSION)
 


Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp/devel/gtk-sharp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtk-sharp.spec	27 Oct 2008 17:33:34 -0000	1.10
+++ gtk-sharp.spec	27 Oct 2008 20:46:04 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name: gtk-sharp
 Version: 1.0.10
-Release: 18%{?dist}
+Release: 20%{?dist}
 Summary: GTK+ and GNOME bindings for Mono
 Group: System Environment/Libraries
 License: LGPLv2
@@ -11,9 +11,11 @@
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:	gtksharp-libdir.patch
+Patch1: gtk-sharp-1.0.10-gtkhtml-3.24.0.patch
 BuildRequires: libtool autoconf automake gnome-sharp-devel vte-devel
-BuildRequires:  mono-devel libxml2-devel libgnomeui-devel
-BuildRequires:  librsvg2-devel gtkhtml3-devel vte-devel
+BuildRequires:  mono-devel libxml2-devel libgnomeui-devel libgnomeprintui22-devel
+BuildRequires:  librsvg2-devel gtkhtml3-devel
+BuildRequires:  gnome-desktop-sharp-devel
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
 
 %description
@@ -53,6 +55,7 @@
 %prep
 %setup -q -n gtk-sharp-%{version}
 %patch0 -p1 -b .libdir
+%patch1 -p1 -b .gtkhtml3.24.0
 #autoreconf -f -i -s
 autoconf
 chmod 644 HACKING
@@ -84,6 +87,7 @@
 %{monodir}/mono/gac/glade-sharp/1*
 %{monodir}/mono/gac/glib-sharp/1*/
 %{monodir}/mono/gac/gnome-sharp/1*/
+%{monodir}/mono/gac/gtkhtml-sharp/1*/
 %{monodir}/mono/gac/pango-sharp/1*/
 %{monodir}/mono/gac/vte-sharp/1*/
 %{monodir}/mono/gac/rsvg-sharp/1*/
@@ -104,6 +108,13 @@
 %{monodir}/pkgconfig/gapi.pc
 
 %changelog
+* Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.10-20
+- fix gtkhtml check for rawhide
+- BR: libgnomeprintui22-devel
+
+* Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.10-19
+- add missing BR: gnome-desktop-sharp
+
 * Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.10-18
 - rebuild for new gnome-sharp