From 3cc43849efd35dcf6133c40ac1d389eb8f7f3c2c72f972dc755d42a0ac2014e7 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Wed, 18 May 2011 12:49:48 +0000
Subject: [PATCH] Accepting request 70523 from network

OBS-URL: https://build.opensuse.org/request/show/70523
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/unison?expand=0&rev=23
---
 fix_makefile.patch                                   | 12 ------------
 unison-2.40.61.tar.gz                                |  3 ---
 ...2.40.61-manual.html => unison-2.40.63-manual.html |  0
 unison-2.40.63.tar.gz                                |  3 +++
 unison.changes                                       |  8 ++++++++
 unison.spec                                          |  4 +---
 6 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 fix_makefile.patch
 delete mode 100644 unison-2.40.61.tar.gz
 rename unison-2.40.61-manual.html => unison-2.40.63-manual.html (100%)
 create mode 100644 unison-2.40.63.tar.gz

diff --git a/fix_makefile.patch b/fix_makefile.patch
deleted file mode 100644
index 3269b36..0000000
--- a/fix_makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2010-10-08 17:44:59.000000000 +0200
-+++ b/Makefile	2011-01-29 18:57:31.334257694 +0100
-@@ -60,7 +60,7 @@
- # NAME, VERSION, and MAJORVERSION, automatically generated
- -include Makefile.ProjectInfo
- 
--Makefile.ProjectInfo: mkProjectInfo.ml $(wildcard ../.bzr/branch/last-revision)
-+Makefile.ProjectInfo: mkProjectInfo $(wildcard ../.bzr/branch/last-revision)
- 	./mkProjectInfo > $@
- 
- mkProjectInfo: mkProjectInfo.ml
diff --git a/unison-2.40.61.tar.gz b/unison-2.40.61.tar.gz
deleted file mode 100644
index cb69ad3..0000000
--- a/unison-2.40.61.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e6114bf6a99d8bbe151250b7e28a74aa546d213f4f7f7914ca086a48b375277b
-size 2702722
diff --git a/unison-2.40.61-manual.html b/unison-2.40.63-manual.html
similarity index 100%
rename from unison-2.40.61-manual.html
rename to unison-2.40.63-manual.html
diff --git a/unison-2.40.63.tar.gz b/unison-2.40.63.tar.gz
new file mode 100644
index 0000000..7c63064
--- /dev/null
+++ b/unison-2.40.63.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e6e00643a7e3908ce3604bb5031e4c6d4c6af5c421a79d08a8b7759de12cd9d
+size 2601791
diff --git a/unison.changes b/unison.changes
index 6ce1c61..338a5be 100644
--- a/unison.changes
+++ b/unison.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Apr 29 09:13:36 UTC 2011 - mhopf@novell.com
+
+- Update to 2.40.63:
+  * Include makefile patch
+  * Make unison compile with ocaml 3.12
+  * Fix incompatibility with OpenSSH 5.6
+
 -------------------------------------------------------------------
 Thu Mar 31 13:16:51 UTC 2011 - saschpe@suse.de
 
diff --git a/unison.spec b/unison.spec
index c7b154d..1828724 100644
--- a/unison.spec
+++ b/unison.spec
@@ -18,7 +18,7 @@
 
 
 Name:           unison
-Version:        2.40.61
+Version:        2.40.63
 Release:        1
 Summary:        A file synchronization tool
 Group:          Productivity/Networking/Other
@@ -28,7 +28,6 @@ Source0:        http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stab
 Source1:        http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}-manual.html
 Source2:        %{name}.desktop
 Source3:        %{name}.png
-Patch0:         fix_makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gtk2-devel ncurses-devel update-desktop-files
 %if 0%{?suse_version} > 1020
@@ -47,7 +46,6 @@ replica to the other.
 
 %prep
 %setup -q
-%patch0 -p 1
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.