Accepting request 49945 from network

Copy from network/unison based on submit request 49945 from user coolo

OBS-URL: https://build.opensuse.org/request/show/49945
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/unison?expand=0&rev=19

unison-ocaml.patch

@@ -0,0 +1,13 @@
+Index: unison-2.32.52/update.mli
+===================================================================
+--- unison-2.32.52.orig/update.mli
++++ unison-2.32.52/update.mli
+@@ -1,7 +1,7 @@
+ (* Unison file synchronizer: src/update.mli *)
+ (* Copyright 1999-2009, Benjamin C. Pierce (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

unison.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct  7 07:58:40 UTC 2010 - aj@suse.de
+
+- Fix build with ocaml 3.12 (patch unison-ocaml.patch).
+
 -------------------------------------------------------------------
 Wed Dec 16 10:51:19 UTC 2009 - mhopf@novell.com
 

unison.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package unison (Version 2.32.52)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,11 +29,12 @@ License:        GPLv3+
 Group:          Productivity/Networking/Other
 AutoReqProv:    on
 Version:        2.32.52
-Release:        1
+Release:        6
 Source0:        http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}.tar.gz
 Source1:        http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}-manual.html
 Source2:        %name.desktop
 Source3:        %name.png
+Patch1:         unison-ocaml.patch
 Url:            http://www.cis.upenn.edu/~bcpierce/unison
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        A file synchronization tool
@@ -53,6 +54,7 @@ Authors:
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.