[unison213] Include fix for OCaml 3.12.

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


commit 779360b711cef3f6014fab15c546d80d8addfb0d
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Jan 16 14:03:19 2012 +0000

    Include fix for OCaml 3.12.

 unison213-ocaml312.patch |   11 +++++++++++
 unison213.spec           |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/unison213-ocaml312.patch b/unison213-ocaml312.patch
new file mode 100644
index 0000000..d17594e
--- /dev/null
+++ b/unison213-ocaml312.patch
@@ -0,0 +1,11 @@
+--- unison-2.13.16/update.mli~	2005-02-07 03:09:03.000000000 +0000
++++ unison-2.13.16/update.mli	2012-01-16 14:01:19.444705273 +0000
+@@ -2,7 +2,7 @@
+ (* $I2: Last modified by tjim on Tue, 14 Sep 2004 11:51:02 -0400 $ *)
+ (* $I3: Copyright 1999-2004 (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/unison213.spec b/unison213.spec
index f7051ce..e62fdd8 100644
--- a/unison213.spec
+++ b/unison213.spec
@@ -23,7 +23,7 @@
 
 Name:      unison%{ver_compat_name}
 Version:   %{ver_compat}%{ver_noncompat}
-Release:   17%{?dist}
+Release:   18%{?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:    unison213-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.13.16-18
+- Include fix for OCaml 3.12.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.13.16-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list