Author: rjones
Update of /cvs/pkgs/rpms/ocaml-ocamlnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22564
Modified Files:
ocaml-ocamlnet.spec
Removed Files:
ocamlnet-debug-configure.patch
Log Message:
Add BR gtk2-devel.
Index: ocaml-ocamlnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlnet/devel/ocaml-ocamlnet.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ocaml-ocamlnet.spec 5 Jan 2010 13:20:35 -0000 1.18
+++ ocaml-ocamlnet.spec 5 Jan 2010 13:32:43 -0000 1.19
@@ -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
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@xxxxxxxxxx> - 2.2.9-17
+* Tue Jan 5 2010 Richard W.M. Jones <rjones@xxxxxxxxxx> - 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@xxxxxxxxxx> - 2.2.9-16
- Rebuild for OCaml 3.11.2.
--- ocamlnet-debug-configure.patch DELETED ---
_______________________________________________
Fedora-ocaml-list mailing list
Fedora-ocaml-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-ocaml-list
