[ocaml-ocamlnet] - Move to new upstream 3.4 version. Note this is not compatible with ocamlnet 2.x.

[Richard W.M. Jones]

commit 6001d991d392676e41c069a66243ef83caf85446
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Sep 19 17:10:23 2011 +0100

    - Move to new upstream 3.4 version.  Note this is not compatible with
      ocamlnet 2.x.

 .gitignore              |    1 +
 ocaml-ocamlnet.spec     |   31 ++++++++++---------------------
 ocamlnet-ocaml310.patch |   23 -----------------------
 ocamlnet-ucred.patch    |   12 ------------
 sources                 |    2 +-
 5 files changed, 12 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a2d7a61..02b7dee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ocamlnet-2.2.9.tar.gz
+/ocamlnet-3.4.tar.gz
diff --git a/ocaml-ocamlnet.spec b/ocaml-ocamlnet.spec
index e61c97c..b49be6b 100644
--- a/ocaml-ocamlnet.spec
+++ b/ocaml-ocamlnet.spec
@@ -5,16 +5,14 @@
 %define __strip /bin/true
 
 Name:           ocaml-ocamlnet
-Version:        2.2.9
-Release:        24%{?dist}
+Version:        3.4
+Release:        1%{?dist}
 Summary:        Network protocols for OCaml
 
 Group:          Development/Libraries
 License:        BSD
 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
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
@@ -44,10 +42,7 @@ In detail, the following features are available:
    parsing and printing, OO-representation of channels, and a lot
    more.
 
- * netcgi1 and netcgi2 focus on portable web applications. netcgi1 is
-   the older, backward-compatible version, whereas netcgi2 bases on a
-   revised design, and is only partly backward-compatible. Supported
-   are CGI, FastCGI, AJP (mod_jk), and SCGI.
+ * netcgi2 focuses on portable web applications.
 
  * rpc implements ONCRPC (alias SunRPC), the remote procedure call
    technology behind NFS and other Unix services.
@@ -111,11 +106,6 @@ files for developing applications that use %{name}-nethttpd.
 %prep
 %setup -q -n ocamlnet-%{version}
 
-pushd src/equeue-gtk1
-%patch0 -p2
-popd
-%patch1 -p1
-
 ./configure -enable-tcl -with-nethttpd \
   -bindir %{_bindir} \
   -datadir %{_datadir}/%{name} \
@@ -129,8 +119,6 @@ popd
 
 
 %build
-# Bletcherous hack to get that extra include path in camlp4 builds.
-echo -e '#!/bin/sh\n%{_bindir}/camlp4 -I %{_libdir}/ocaml/camlp4/Camlp4Parsers "$@"' > camlp4; chmod 0755 camlp4; export PATH=`pwd`:$PATH
 make all
 %if %opt
 make opt
@@ -144,10 +132,6 @@ mkdir -p $OCAMLFIND_DESTDIR
 mkdir -p $OCAMLFIND_DESTDIR/stublibs
 make install
 
-# cgi/META conflicts with mod_caml
-rm $RPM_BUILD_ROOT%{_libdir}/ocaml/cgi/META
-rmdir $RPM_BUILD_ROOT%{_libdir}/ocaml/cgi
-
 # rpc-generator/dummy.mli is empty and according to Gerd Stolpmann can
 # be deleted safely.  This avoids an rpmlint warning.
 rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/rpc-generator/dummy.mli
@@ -173,10 +157,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/equeue-gtk2
 %{_libdir}/ocaml/equeue-ssl
 %{_libdir}/ocaml/equeue-tcl
-%{_libdir}/ocaml/netcgi1
+%{_libdir}/ocaml/netcamlbox
 %{_libdir}/ocaml/netcgi2
 %{_libdir}/ocaml/netcgi2-plex
 %{_libdir}/ocaml/netclient
+%{_libdir}/ocaml/netgssapi
+%{_libdir}/ocaml/netmulticore
 %{_libdir}/ocaml/netplex
 %{_libdir}/ocaml/netshm
 %{_libdir}/ocaml/netstring
@@ -218,7 +204,6 @@ rm -rf $RPM_BUILD_ROOT
 %files nethttpd
 %defattr(-,root,root,-)
 %doc ChangeLog RELNOTES
-%{_libdir}/ocaml/nethttpd-for-netcgi1
 %{_libdir}/ocaml/nethttpd-for-netcgi2
 %{_libdir}/ocaml/nethttpd
 %if %opt
@@ -239,6 +224,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 19 2011 Richard W.M. Jones <rjones at redhat.com> - 3.4-1
+- Move to new upstream 3.4 version.  Note this is not compatible with
+  ocamlnet 2.x.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.9-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index e7a171f..4423091 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3655e3be3bb2806e0a1f48bb7ce16fb3  ocamlnet-2.2.9.tar.gz
+920414f896af983e7458c03a492f7c62  ocamlnet-3.4.tar.gz