[unison227] Include fix for OCaml 3.12.

Richard W.M. Jones rjones at fedoraproject.org
Mon Jan 16 14:14:13 UTC 2012


commit 442ebdd8db3deefb64d7c337c1c886e6ae54c99c
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Jan 16 14:07:47 2012 +0000

    Include fix for OCaml 3.12.

 unison227-ocaml312.patch |   11 +++++++++++
 unison227.spec           |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/unison227-ocaml312.patch b/unison227-ocaml312.patch
new file mode 100644
index 0000000..24005e8
--- /dev/null
+++ b/unison227-ocaml312.patch
@@ -0,0 +1,11 @@
+--- unison-2.27.57/update.mli.old	2012-01-16 14:08:18.784651309 +0000
++++ unison-2.27.57/update.mli	2012-01-16 14:08:35.414983940 +0000
+@@ -1,7 +1,7 @@
+ (* Unison file synchronizer: src/update.mli *)
+ (* Copyright 1999-2007 (see COPYING for details) *)
+ 
+-module NameMap : Map.S with type key = Name.t
++module NameMap : MyMap.S with type key = Name.t
+ 
+ type archive =
+     ArchiveDir of Props.t * archive NameMap.t
diff --git a/unison227.spec b/unison227.spec
index 94c8dcf..9ced632 100644
--- a/unison227.spec
+++ b/unison227.spec
@@ -23,7 +23,7 @@
 
 Name:      unison%{ver_compat_name}
 Version:   %{ver_compat}%{ver_noncompat}
-Release:   15%{?dist}
+Release:   16%{?dist}
 
 Summary:   Multi-master File synchronization tool
 
@@ -35,6 +35,9 @@ Source1:   unison.png
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 ExcludeArch:    sparc64 s390 s390x
 
+# Fix for OCaml 3.12.
+Patch1:    unison227-ocaml312.patch
+
 BuildRequires: ocaml >= 3.10.2-2
 BuildRequires: ocaml-lablgtk-devel >= 2.6.0
 BuildRequires: tetex-latex
@@ -66,6 +69,7 @@ exist if you require a different major version.
 
 %prep
 %setup -q -n unison-%{version}
+%patch1 -p1
 
 %build
 make NATIVE=true UISTYLE=gtk2
@@ -128,6 +132,9 @@ exit 0
 %{_datadir}/pixmaps/unison-%{ver_compat}.png
 
 %changelog
+* Mon Jan 16 2012 Richard W.M. Jones <rjones at redhat.com> - 2.27.57-16
+- Include fix for OCaml 3.12.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.27.57-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list