diff --git a/ocaml-ocamlnet.spec b/ocaml-ocamlnet.spec index 4167d09..5777002 100644 --- a/ocaml-ocamlnet.spec +++ b/ocaml-ocamlnet.spec @@ -3,7 +3,7 @@ Name: ocaml-ocamlnet Version: 2.2.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network protocols for OCaml Group: Development/Libraries @@ -12,10 +12,11 @@ URL: http://www.ocaml-programming.de/programming/ocamlnet.html Source0: http://www.ocaml-programming.de/packages/ocamlnet-%{version}.tar.gz ExcludeArch: ppc64 Patch0: ocamlnet-ocaml310.patch +Patch1: ocamlnet-ucred.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ocaml +BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-findlib-devel @@ -114,6 +115,7 @@ files for developing applications that use %{name}-nethttpd. pushd src/equeue-gtk1 %patch0 -p2 popd +%patch1 -p1 ./configure -enable-tcl -with-nethttpd \ -bindir %{_bindir} \ @@ -231,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 12 2008 Richard W.M. Jones - 2.2.9-2 +- Rebuild for OCaml 3.10.1. + * Wed Nov 7 2007 Richard W.M. Jones - 2.2.9-1 - New upstream release 2.2.9. - A more bletcherous, but more working, patch to fix the camlp4 diff --git a/ocamlnet-ucred.patch b/ocamlnet-ucred.patch new file mode 100644 index 0000000..7466f62 --- /dev/null +++ b/ocamlnet-ucred.patch @@ -0,0 +1,12 @@ +diff -ur ocamlnet-2.2.9/src/rpc-auth-local/rpclocal.c ocamlnet-2.2.9.new/src/rpc-auth-local/rpclocal.c +--- ocamlnet-2.2.9/src/rpc-auth-local/rpclocal.c 2007-11-01 22:12:33.000000000 +0000 ++++ ocamlnet-2.2.9.new/src/rpc-auth-local/rpclocal.c 2008-02-12 21:01:21.000000000 +0000 +@@ -3,6 +3,8 @@ + * + */ + ++#define _GNU_SOURCE /* for SO_PEERCRED / struct ucred */ ++ + #include "caml/mlvalues.h" + #include "caml/alloc.h" + #include "caml/memory.h"