[ocaml-xmlrpc-light] - Rebuilt for updated ocamlnet. - Apply patch from Debian to fix builds against ocamlnet 3 (thanks

Richard W.M. Jones rjones at fedoraproject.org
Wed Sep 21 16:25:17 UTC 2011


commit e7f3dcec1293965cf5a9a6790277ddd767f7f960
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Sep 21 17:20:34 2011 +0100

    - Rebuilt for updated ocamlnet.
    - Apply patch from Debian to fix builds against ocamlnet 3
      (thanks Stephane Glondu).

 ..._patches_0002-Compile-with-ocamlnet-3.3.5.patch |   39 ++++++++++++++++++++
 ocaml-xmlrpc-light.spec                            |   11 +++++-
 2 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/debian_patches_0002-Compile-with-ocamlnet-3.3.5.patch b/debian_patches_0002-Compile-with-ocamlnet-3.3.5.patch
new file mode 100644
index 0000000..8215812
--- /dev/null
+++ b/debian_patches_0002-Compile-with-ocamlnet-3.3.5.patch
@@ -0,0 +1,39 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Fri, 22 Jul 2011 00:32:59 +0200
+Subject: Compile with ocamlnet 3.3.5
+
+---
+ XmlRpcServer.ml |    8 +++-----
+ 1 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/XmlRpcServer.ml b/XmlRpcServer.ml
+index 3d4f130..47d6a8b 100644
+--- a/XmlRpcServer.ml
++++ b/XmlRpcServer.ml
+@@ -331,13 +331,11 @@ object (self)
+     Netcgi_cgi.run ~config ~output_type:(`Transactional buffered) self#process
+ end
+ 
+-open Netcgi1_compat
+-
+ class netplex ?(parallelizer=Netplex_mp.mp()) ?(handler="xmlrpc") () =
+ object (self)
+   inherit base
+ 
+-  method private process env (cgi : Netcgi_types.cgi_activation) =
++  method private process env (cgi : Netcgi.cgi_activation) =
+     match cgi#request_method with
+       | `POST ->
+           let input = cgi#argument_value "BODY" in
+@@ -377,8 +375,8 @@ object (self)
+       } in
+ 
+     let config_cgi =
+-      { Netcgi_env.default_config with
+-          Netcgi_env.permitted_input_content_types = [ "text/xml" ]
++      { Netcgi.default_config with
++          Netcgi.permitted_input_content_types = [ "text/xml" ]
+       } in
+ 
+     let handlers = [handler, xmlrpc] in
+-- 
diff --git a/ocaml-xmlrpc-light.spec b/ocaml-xmlrpc-light.spec
index 600faec..0855384 100644
--- a/ocaml-xmlrpc-light.spec
+++ b/ocaml-xmlrpc-light.spec
@@ -3,7 +3,7 @@
 
 Name:           ocaml-xmlrpc-light
 Version:        0.6.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OCaml library for writing XML-RPC clients and servers
 
 Group:          Development/Libraries
@@ -21,6 +21,8 @@ BuildRequires:  ocaml-ocamlnet-devel
 BuildRequires:  ocaml-ocamlnet-nethttpd-devel
 BuildRequires:  dos2unix
 
+Patch1:         debian_patches_0002-Compile-with-ocamlnet-3.3.5.patch
+
 %define _use_internal_dependency_generator 0
 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
 %define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
@@ -45,6 +47,8 @@ developing applications that use %{name}.
 dos2unix LICENSE
 dos2unix README.txt
 
+%patch1 -p1
+
 
 %build
 make
@@ -84,6 +88,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 21 2011 Richard W.M. Jones <rjones at redhat.com> - 0.6.1-6
+- Rebuilt for updated ocamlnet.
+- Apply patch from Debian to fix builds against ocamlnet 3
+  (thanks Stephane Glondu).
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list