From b6bb77aa4796f0492e95e386dc868cb89eff206a Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@fedoraproject.org>
Date: Aug 31 2008 10:33:12 +0000
Subject: - New upstream release 4.0.1.

- Patch a build problem in the test suite.
- ml file should be packaged in the -devel subpackage, not in main.

---

diff --git a/.cvsignore b/.cvsignore
index c273d99..2815f1b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-sexplib310-3.7.4.tar.bz2
+sexplib310-4.0.1.tar.bz2
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..ad8e3d2
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+ocaml-sexplib-4_0_1-1_fc10:HEAD:ocaml-sexplib-4.0.1-1.fc10.src.rpm:1220178767
diff --git a/ocaml-sexplib.spec b/ocaml-sexplib.spec
index c40b8e4..66e5892 100644
--- a/ocaml-sexplib.spec
+++ b/ocaml-sexplib.spec
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-sexplib
-Version:        3.7.4
-Release:        2%{?dist}
+Version:        4.0.1
+Release:        1%{?dist}
 Summary:        OCaml library for converting OCaml values to S-expressions
 
 Group:          Development/Libraries
@@ -12,10 +12,12 @@ URL:            http://www.ocaml.info/home/ocaml_sources.html#sexplib310
 Source0:        http://www.ocaml.info/ocaml_sources/sexplib310-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         sexplib-4.0.1-unix-fix.patch
+
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
-BuildRequires:  ocaml-type-conv >= 1.5.0
+BuildRequires:  ocaml-type-conv >= 1.6.1
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  dos2unix
 
@@ -51,6 +53,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n sexplib310-%{version}
+%patch0 -p1
 dos2unix LICENSE.Tywith
 
 
@@ -84,6 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/ocaml/sexplib/*.cmxa
 %endif
 %exclude %{_libdir}/ocaml/sexplib/*.mli
+%exclude %{_libdir}/ocaml/sexplib/*.ml
 
 
 %files devel
@@ -94,9 +98,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/sexplib/*.cmxa
 %endif
 %{_libdir}/ocaml/sexplib/*.mli
+%{_libdir}/ocaml/sexplib/*.ml
 
 
 %changelog
+* Sun Aug 31 2008 Richard W.M. Jones <rjones@redhat.com> - 4.0.1-1
+- New upstream release 4.0.1.
+- Patch a build problem in the test suite.
+- ml file should be packaged in the -devel subpackage, not in main.
+
 * Mon May 10 2008 Richard W.M. Jones <rjones@redhat.com> - 3.7.4-2
 - Added BR ocaml-camlp4-devel.
 - Added a check section to run the included tests.
diff --git a/sexplib-4.0.1-unix-fix.patch b/sexplib-4.0.1-unix-fix.patch
new file mode 100644
index 0000000..85a738a
--- /dev/null
+++ b/sexplib-4.0.1-unix-fix.patch
@@ -0,0 +1,23 @@
+diff -ur sexplib310-4.0.1.orig/lib_test/Makefile sexplib310-4.0.1.unix-fix/lib_test/Makefile
+--- sexplib310-4.0.1.orig/lib_test/Makefile	2008-08-20 19:03:20.000000000 +0100
++++ sexplib310-4.0.1.unix-fix/lib_test/Makefile	2008-08-31 11:26:35.000000000 +0100
+@@ -3,7 +3,7 @@
+ export INCDIRS = ../lib
+ export LIBDIRS = ../lib
+ export LIBS = sexplib
+-export PACKS = bigarray num
++export PACKS = bigarray num unix
+ 
+ define PROJ_sub1
+   SOURCES = conv_test.ml
+diff -ur sexplib310-4.0.1.orig/lib_test/OMakefile sexplib310-4.0.1.unix-fix/lib_test/OMakefile
+--- sexplib310-4.0.1.orig/lib_test/OMakefile	2008-08-20 19:03:20.000000000 +0100
++++ sexplib310-4.0.1.unix-fix/lib_test/OMakefile	2008-08-31 11:25:58.000000000 +0100
+@@ -1,6 +1,6 @@
+ OCAML_LIBRARIES = sexplib
+ 
+-OCamlMakePPDeps($(PA_SEXP_CONV), conv_test)
++OCamlMakePPDeps($(PA_SEXP_CONV), conv_test, unix)
+ 
+ OCamlMakeProjDefaults(conv_test.exe sexp_test.exe)
+ 
diff --git a/sources b/sources
index e9eaf24..5415e5c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8fd387d2ac7a24576121da365819b72  sexplib310-3.7.4.tar.bz2
+a0ff4ddd0069879398f4eac0cb6a569f  sexplib310-4.0.1.tar.bz2