Add BR gtk2-devel.

ocaml-ocamlnet.spec

@@ -6,7 +6,7 @@
 
 Name:           ocaml-ocamlnet
 Version:        2.2.9
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Network protocols for OCaml
 
 Group:          Development/Libraries
@@ -15,7 +15,6 @@ URL:            http://projects.camlcity.org/projects/ocamlnet.html
 Source0:        http://download.camlcity.org/download/ocamlnet-%{version}.tar.gz
 Patch0:         ocamlnet-ocaml310.patch
 Patch1:         ocamlnet-ucred.patch
-Patch2:         ocamlnet-debug-configure.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
@@ -27,9 +26,15 @@ BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-pcre-devel
 BuildRequires:  ocaml-ssl-devel
 BuildRequires:  ocaml-lablgtk-devel
+# These BRs should be pushed down (as simple Requires) to the respective
+# ocaml-X-devel packages.  For example, building something against
+# lablgtk currently gives:
+# Error: Error on dynamically loaded library: /usr/lib64/ocaml/stublibs/dlllablgtk2.so: libgtk-x11-2.0.so.0: cannot open shared object file: No such file or directory
+# if gtk2-devel is not installed separately.
 BuildRequires:  pcre-devel
 BuildRequires:  openssl-devel
 BuildRequires:  tcl-devel
+BuildRequires:  gtk2-devel
 
 %global __ocaml_requires_opts -i Asttypes -i Outcometree -i Parsetree
 
@@ -118,7 +123,6 @@ pushd src/equeue-gtk1
 %patch0 -p2
 popd
 %patch1 -p1
-%patch2 -p1
 
 ./configure -enable-tcl -with-nethttpd \
   -bindir %{_bindir} \
@@ -243,9 +247,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Jan  5 2010 Richard W.M. Jones <rjones@redhat.com> - 2.2.9-17
+* Tue Jan  5 2010 Richard W.M. Jones <rjones@redhat.com> - 2.2.9-18
 - Use new dependency generator in upstream RPM 4.8.
-- Add a temporary patch to diagnose build problem on Koji.
+- Add BR gtk2-devel.
 
 * Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 2.2.9-16
 - Rebuild for OCaml 3.11.2.

ocamlnet-debug-configure.patch

@@ -1,13 +0,0 @@
---- ocamlnet-2.2.9/configure.orig	2010-01-05 13:13:25.375323415 +0000
-+++ ocamlnet-2.2.9/configure	2010-01-05 13:14:19.205448039 +0000
-@@ -552,6 +552,10 @@
- EOF
-     # Note: this newer API is never broken in the sense checked below, i.e.
-     # such lablgtk2 versions do not exist.
-+
-+    ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml
-+    tmp/gtk
-+
-     if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml >/dev/null 2>/dev/null && tmp/gtk; then
-         echo "yes"
-         gtk2_io_add_watch_supports_lists="-ppopt -DGTK2_IO_ADD_WATCH_SUPPORTS_LISTS"